[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5 -s ours am: 9da6b6f4 -s ours am: b2af05bf -s ours am: 0dfeac53 -s ours am: 5fe36177 -s ours am: 6887ea15 -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/+/13448945

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa8680f713dcee23c523c3a00f9d438f823d3bbc