Merge "Clock color on preview renderer" into udc-dev am: 15f4d22a am: 66aa833a am: 0befb2d5

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



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