Merge "fix(non linear font scaling)!: fix QS text being cut off when 200% font scaling" into udc-dev am: 0acac4d370

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

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