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

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

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



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