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

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



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