Merge "fix(non linear font scaling): fix test from timing out." into udc-dev am: 6e88b696

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



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