Merge changes from topic "am-9c233739-95e1-4bd7-8c26-6018062f8dc7" into ub-launcher3-master

* changes:
  [automerger] Clear ref to animation after drag & drop animation completes am: 7dd3b521ff
  Clear ref to animation after drag & drop animation completes

src/com/android/launcher3/dragndrop/DragLayer.java

@@ -1,3 +1,4 @@
+
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -479,6 +480,7 @@ public class DragLayer extends BaseDragLayer<Launcher> {
                 case ANIMATION_END_REMAIN_VISIBLE:
                     break;
                 }
+                mDropAnim = null;
             }
         });
         mDropAnim.start();
@@ -488,6 +490,7 @@ public class DragLayer extends BaseDragLayer<Launcher> {
         if (mDropAnim != null) {
             mDropAnim.cancel();
         }
+        mDropAnim = null;
         if (mDropView != null) {
             mDragController.onDeferredEndDrag(mDropView);
         }