Merge "Properly clear animations after dragging" into sc-dev am: 2ce2d91d...

Merge "Properly clear animations after dragging" into sc-dev am: 2ce2d91d am: 94940730 am: 4239d884

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

Change-Id: Ia39698187ae6a719d60aad6e2645fc2b9e76cbe8