[automerger skipped] Merge "Fix NPE if draging again while animating" into...

[automerger skipped] Merge "Fix NPE if draging again while animating" into tm-dev am: a876e7b2 am: d1557103 am: 59422994 -s ours am: 808539a4 -s ours

am skip reason: Merged-In I2e94f3ece3f211ceb15f380e4ee9322b8c27f8ac with SHA-1 2641f715 is already in history

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



Change-Id: I1cc561e3457d4ec37ce2e22bc246b87507fdb6e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>