[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: 422280c1 -s ours am: 01961e9e -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/+/13448946

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc9804aa492679117924465cdc69dc605edc2c34