Merge "fix(non linear font scaling): wait longer after setting font scale to...

Merge "fix(non linear font scaling): wait longer after setting font scale to fix flaky test" into udc-dev am: 17a23d5b

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



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