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

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



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