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: 1de026b1" into udc-qpr-dev-plus-aosp am: 6b6e1e37

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



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