[automerger skipped] Merge "[Security Report] Fix Settings...

[automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-qpr-dev am: 6dc9f825 am: 15cd80a3 -s ours am: e14dc177 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia694926c0078a0b02f721fd427fc1411b6a40088