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: 5c0c69ba

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



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