Merge "Fix an issue where tasks moving to front would collapse the stack." into tm-dev am: 13a28fff81 am: 668dddcd4f am: 0334b06238 am: 3c99cf5158

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18876919

Change-Id: I4847188a9160e585d9c6f087ad78614b737bc67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

@@ -2466,11 +2466,10 @@ public class BubbleStackView extends FrameLayout
     private void animateSwitchBubbles() {
         // If we're no longer expanded, this is meaningless.
         if (!mIsExpanded) {
+            mIsBubbleSwitchAnimating = false;
             return;
         }
 
-        mIsBubbleSwitchAnimating = true;
-
         // The surface contains a screenshot of the animating out bubble, so we just need to animate
         // it out (and then release the GraphicBuffer).
         PhysicsAnimator.getInstance(mAnimatingOutSurfaceContainer).cancel();
@@ -3151,6 +3150,7 @@ public class BubbleStackView extends FrameLayout
             }, 0);
 
             if (!mIsExpansionAnimating) {
+                mIsBubbleSwitchAnimating = true;
                 mSurfaceSynchronizer.syncSurfaceAndRun(() -> {
                     post(this::animateSwitchBubbles);
                 });