Manual merge of 40170 (b4a107d826) DO NOT MERGE

Fix the lock screen.

core/java/android/view/View.java

@@ -8192,7 +8192,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
      */
     public void clearAnimation() {
         if (mCurrentAnimation != null) {
-            mCurrentAnimation.cancel();
+            mCurrentAnimation.detach();
         }
         mCurrentAnimation = null;
     }

core/java/android/view/animation/Animation.java

@@ -277,6 +277,16 @@ public abstract class Animation implements Cloneable {
         mMore = mOneMoreTime = false;
     }
 
+    /**
+     * @hide
+     */
+    public void detach() {
+        if (mStarted && !mEnded) {
+            if (mListener != null) mListener.onAnimationEnd(this);
+            mEnded = true;
+        }
+    }
+
     /**
      * Whether or not the animation has been initialized.
      *