[automerger skipped] Merge "Adjusts the default magnification settings for...

[automerger skipped] Merge "Adjusts the default magnification settings for config_magnification_area" into sc-dev am: 966a1b15 am: 8db4d913 -s ours

am skip reason: Merged-In I67947285eb6a73b8e0e21d1db866c426a0ea49d7 with SHA-1 2e3f08b1 is already in history

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

Change-Id: Iae6b4bd5222a3b2db726beb3aeb1a0688a60514f