Merge "fix(non linear font scaling): avoid trying to apply non-linear font scaling to apps in compatibility mode" into udc-dev am: ef221803 am: f84b2ff9

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



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