[automerger skipped] Merge "Adding flag for font scaling tile" into tm-qpr-dev...

[automerger skipped] Merge "Adding flag for font scaling tile" into tm-qpr-dev am: fe18a7bb am: d7cab58d -s ours

am skip reason: Merged-In I07f43825f5bcdb797526819b85673c564abbdfee with SHA-1 0e56df1d is already in history

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



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