[automerger skipped] Merge "fix(non linear font scaling): fix test timeout...

[automerger skipped] Merge "fix(non linear font scaling): fix test timeout flakiness" into udc-dev am: 1f9562b6 am: f3947d29 -s ours am: aa2b580c -s ours

am skip reason: Merged-In I67dc51b587602f72949549ac17253628ad1a2e1a with SHA-1 08dc87a0 is already in history

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



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