Merge "fix(non linear font scaling): fix activity test flakiness" into udc-dev...

Merge "fix(non linear font scaling): fix activity test flakiness" into udc-dev am: f197ae41 am: 4d298ce6 am: 1034fd4e am: da203819

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



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