[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity...

[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9b am: f71502fb am: 2a0cad3a -s ours

am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I772b4de954c55d1f9d8a18e4386b74477a6c8c7e