Merge "Fix NPE if draging again while animating" into tm-qpr-dev am: e14bb2eb

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



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