Merge "Cancel current animation instead of candidate" into tm-qpr-dev am: 6eda1790

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



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