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

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

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

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