[automerger skipped] Merge "Add key...

[automerger skipped] Merge "Add key ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED" into tm-qpr-dev am: 1718a9c3 am: 97325239 -s ours am: bdf9aaf0 -s ours

am skip reason: Merged-In I6a20e2af38064be2b03e2cdda530964989a2d0b0 with SHA-1 1fed91be is already in history

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



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