Merge "Properly clear animations after dragging" into sc-dev am: 2ce2d91d1e am: 6a277f9cae

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

Change-Id: Ia2286ddcb3048c5a7c5a6a508103d984d812deb3