Merge "fix(non linear font scaling)!: fix status bar date/battery text being cut off when 200% font scaling" into udc-dev am: db2bd90f am: 6884be7b am: 0eb7e1ab am: 1cc0727a

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



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