Merge "Fix clock font weight animation to always match the latest doze state."...

Merge "Fix clock font weight animation to always match the latest doze state." into sc-dev am: be9f6e9b

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

Change-Id: I8c3ea1e26c025c2780619ddf90f49b178baf1ea9