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: 69350e1b

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



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