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 am: dbb2ef12

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



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