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: 5da6a70f

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



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