Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev
am: a9d9e557e6 -s ours
Change-Id: I5b19971e761cdbce47c483873407e0a7a7fc7813
This commit is contained in: