Merge "Merge "Support small clock for the lock screen preview" into udc-dev...

Merge "Merge "Support small clock for the lock screen preview" into udc-dev am: b03c480d am: 40fac141 am: 4086d176" into udc-qpr-dev-plus-aosp am: 5cde25aa

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



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