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

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

Change-Id: I0a9494dacf91259a7fa30260825378e4ab579802