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

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

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



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