Merge "Adding flag for font scaling tile" into tm-qpr-dev am: fe18a7bb

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



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