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

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

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