Merge "Switch to small clock in split shade in certain edge scenarios" into...

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

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



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