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 am: 45f2279c

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



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