[automerger skipped] Merge "Adds a new config flag, config_magnification_area"...

[automerger skipped] Merge "Adds a new config flag, config_magnification_area" into sc-dev am: be1859ed -s ours

am skip reason: Change-Id Ib14dc6f48d5695c5729b2552cac72ac603db0436 with SHA-1 0b488920 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c95d388b5cd6abe93ac1403a7a26216a5fcb8f4