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

[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3 -s ours am: efb2543e -s ours am: 385b5caf -s ours am: 8aa56318 -s ours am: 1f234b37 -s ours am: 354bdce8 -s ours

am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 32d5d3a3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69d2291b6267b149d31c3cf18257d774ce2fff3a