[automerger skipped] Merge "Adjust clock switch animation timing" into udc-dev...

[automerger skipped] Merge "Adjust clock switch animation timing" into udc-dev am: 6c0a668d am: 5be656e3 am: f7fe8bf1 -s ours am: ff47a812 -s ours

am skip reason: Merged-In I1799bfd351ba9da61d9233f7a924145579758ee0 with SHA-1 5f3c9eab is already in history

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



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