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: c3cad761 am: 81caebf5 am: 71ad7297

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



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