Merge "fix(non linear font scaling): optimize test to reduce flaky timeouts"...

Merge "fix(non linear font scaling): optimize test to reduce flaky timeouts" into udc-dev am: d2e529d3

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



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