[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6
-s ours am: 9da6b6f4ae
-s ours am: b2af05bf21
-s ours am: 0dfeac5326
-s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3
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: Idd1840366161db05f9ca1c772ea2b2b866fb4efa
This commit is contained in: