Merge "fix(non linear font scaling)!: fix status bar date/battery text being cut off when 200% font scaling" into udc-dev am: db2bd90fb4 am: 531c586a87

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

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