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: I40da4d1cb60406a5bb3379721d73d1b2acff55e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>