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

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



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