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

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



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