Merge "Fix bug where the clock may not exist when using custom animation."...

Merge "Fix bug where the clock may not exist when using custom animation." into tm-qpr-dev am: 19e7d37b

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



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