Merge "Cancel current animation instead of candidate" into udc-dev am: db510b73

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



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