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: I8d8c24d98340c1b9ec3c0907ecc44235d3cf9ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>