[automerger skipped] Merge "[DO NOT MERGE] Revert "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue"" into pi-dev am: 56dc96d1 -s ours am: 1e8d908c -s ours am: 1a4cf947 -s ours am: 097d262f -s ours am: faa183cb -s ours am: 7772bf58 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13910509

Change-Id: I25c1a058662bea6401d61134dc03e7f642326309