[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 am: c0affdcf -s ours

am skip reason: Merged-In Ib14dc6f48d5695c5729b2552cac72ac603db0436 with SHA-1 ab72f7bb is already in history

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

Change-Id: I81f0d980df71ce21239dc29c58e7ebe45544de76