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

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

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



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