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

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



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