Merge "Fix #testChangeFontScaleNoRelaunch flaky" into tm-dev am: 8c1fad0d74 am: a7feff3b0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17197588 Change-Id: Ibc729be680e544d2518f421de3e0aa91aa45eabe
This commit is contained in: