Merge "fix(non linear font scaling): fix test timeout flakiness" into udc-qpr-dev am: c163059e

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



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