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

[automerger skipped] fix(non linear font scaling): fix test timeout flakiness am: e99f90e8 -s ours am: 0560fee3 -s ours

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

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



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