[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 -s ours

am skip reason: Change-Id I67947285eb6a73b8e0e21d1db866c426a0ea49d7 with SHA-1 f9d7150a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4c4207186756be02c942b79cfc065931a9b9ef0