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

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



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