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: 05799f55 am: becd8c5f

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



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