[automerger skipped] fix(non linear font scaling): clock & battery textviews...

[automerger skipped] fix(non linear font scaling): clock & battery textviews might be cutoff in status bar when larger font size am: 2515eb25 am: 347024ba -s ours

am skip reason: Merged-In I653584d5963b38ce2ef2ba05ca9df63280aac128 with SHA-1 e5fc793a is already in history

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



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