Merge "Step clock animation: make animation cancellation instant" into udc-dev...

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

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



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