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

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



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