[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: b5c065a3 -s ours

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

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



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