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

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

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