Merge "Adjust clock switch animation timing" into udc-qpr-dev am: 60a2af1e am: 5f95e7f4

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



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