Merge "chore(non linear font scaling): make FontScaleConverterActivityTest an...

Merge "chore(non linear font scaling): make FontScaleConverterActivityTest an ironwood test" into udc-dev am: ffa6d53e

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



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