[automerger skipped] Merge "Adjust clock switch animation timing" into udc-dev am: 6c0a668d51 am: 5be656e3e8 -s ours
am skip reason: Merged-In I1799bfd351ba9da61d9233f7a924145579758ee0 with SHA-1 5f3c9eab6c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22955246
Change-Id: I9c187cfe63962f892d9bf33d073c27259a203bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: