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: b1cb75a5

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



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