[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3
-s ours am: efb2543e93
-s ours am: 385b5cafd2
-s ours am: 8aa56318f8
-s ours am: 422280c10d
-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/+/13448946
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ba00bfb17a2256c08a88356337dccfa58e4f651
This commit is contained in: