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

[automerger skipped] Merge "Merge "fix(non linear font scaling): fix test timeout flakiness" into udc-qpr-dev am: c163059e" into udc-qpr-dev-plus-aosp am: c7098857 -s ours

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

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



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