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 am: bf8df6a3 am: 6e6bd7a3

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



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