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

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

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



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