[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 -s ours am: 1b8166a9 -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: I9b949b29642e96087b3197cfa1ebaefd14627a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>