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: Ic0f943c7a705b5ddbb9d35c03bcc3e0da4f80968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>