Merge "Enable auto-add for the font scaling tile" into udc-dev am: 2e196a41 am: c194683f

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



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