Merge "Fix small analog clock preview" into udc-dev am: 97e26586 am: 22c24758 am: 13910925

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



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