Merge "Switch to small clock in split shade in certain edge scenarios" into udc-dev am: a4ddddd2 am: 082a864c am: 2ada0abd am: 9fc137a7

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



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