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 am: 57ecc58f

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



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