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

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



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