Merge "Clock color on preview renderer" into udc-dev am: 15f4d22a

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



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