Merge "Switch to small clock in split shade in certain edge scenarios" into udc-dev am: a4ddddd2

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



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