Merge "Merge "fix(non linear font scaling)!: fix QS text being cut off when...

Merge "Merge "fix(non linear font scaling)!: fix QS text being cut off when 200% font scaling" into udc-dev am: 0acac4d3 am: 391b9210 am: 222b6ba3" into udc-qpr-dev-plus-aosp am: eefa772a

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



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