Merge "Clocks now correctly respond to font setting changes" into tm-qpr-dev...

Merge "Clocks now correctly respond to font setting changes" into tm-qpr-dev am: fa0dc28b am: f0a7aa68

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



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