Merge "Fix clock fading in incorrectly" into tm-qpr-dev am: c72ea6b3 am:...

Merge "Fix clock fading in incorrectly" into tm-qpr-dev am: c72ea6b3 am: 0a0337a4 am: c2966f2f am: 7b23aa66

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



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