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

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



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