[AppBarLayout] Updated setLifted() to preserve lifted state if using setLiftable() programmatically

PiperOrigin-RevId: 388539565

Author: dsn5ft

lib/java/com/google/android/material/appbar/AppBarLayout.java

@@ -857,17 +857,21 @@ private boolean setLiftableState(boolean liftable) {
    * @return true if the lifted state changed
    */
   public boolean setLifted(boolean lifted) {
-    return setLiftedState(lifted);
+    return setLiftedState(lifted, /* force= */ true);
   }
 
   /** Returns whether the {@link AppBarLayout} is in a lifted state or not. */
   public boolean isLifted() {
     return lifted;
   }
 
-  // Internal helper method that updates lifted state.
   boolean setLiftedState(boolean lifted) {
-    if (this.lifted != lifted) {
+    return setLiftedState(lifted, /* force= */ !liftableOverride);
+  }
+
+  // Internal helper method that updates lifted state.
+  boolean setLiftedState(boolean lifted, boolean force) {
+    if (force && this.lifted != lifted) {
       this.lifted = lifted;
       refreshDrawableState();
       if (liftOnScroll && getBackground() instanceof MaterialShapeDrawable) {