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

Merge "Support small clock for the lock screen preview" into udc-dev am: b03c480d am: 40fac141 am: 1de026b1

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



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