Merge "Prevent scaling of clocks based on accessibility" into tm-qpr-dev am:...

Merge "Prevent scaling of clocks based on accessibility" into tm-qpr-dev am: f1be4f07 am: 04725488

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



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