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: 967dedad am: 75411061

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



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