[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 -s ours am: 739bf235e5 -s ours am: c271a656a7 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 eaeb50271e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieab165588cac75977ce1a4737f401e49ff2af825
This commit is contained in: