Merge "Step clock animation: make animation cancellation instant" into udc-dev am: 4998f73d

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



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