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

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

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



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