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

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



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