Merge "Revert "fix(non linear font scaling): fix status bar ui broken when...

Merge "Revert "fix(non linear font scaling): fix status bar ui broken when 200% font scaling"" into udc-dev am: b26d3a55 am: 92274308

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



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