Merge "Fix issue where clock color would not change" into sc-dev am: 0bd23800 am: 961804ff

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

Change-Id: I56ce926cb809feb2a6c5c7e909dc9bf7c70ade8a