Merge "Fix small analog clock preview" into udc-dev am: 97e26586 am: 9754a915

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



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