Revert "Set mState = mCurrentStableState in onAnimationCancel"

This reverts commit 8935d9515c.

Reason for revert:
Bug: 109814458
Bug: 79935289

Change-Id: I33e4933a68060b6055ad7af8e45cffceec14880d

src/com/android/launcher3/LauncherStateManager.java

@@ -347,12 +347,6 @@ public class LauncherStateManager {
                 }
             }
 
-            @Override
-            public void onAnimationCancel(Animator animation) {
-                super.onAnimationCancel(animation);
-                mState = mCurrentStableState;
-            }
-
             @Override
             public void onAnimationSuccess(Animator animator) {
                 // Run any queued runnables
@@ -438,6 +432,7 @@ public class LauncherStateManager {
     }
 
     public void setCurrentUserControlledAnimation(AnimatorPlaybackController controller) {
+        clearCurrentAnimation();
         setCurrentAnimation(controller.getTarget());
         mConfig.userControlled = true;
         mConfig.playbackController = controller;