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

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



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