Merge "Add feature flag to Font Scaling Tile" into tm-qpr-dev am: 1779ed69 am: 0ca3dcb7

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



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