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

Merge "Merge "Revert "fix(non linear font scaling): fix status bar ui broken when 200% font scaling"" into udc-dev am: b26d3a55 am: 92274308 am: 688eb17a" into udc-qpr-dev-plus-aosp am: 44215ca6

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



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