Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a -s ours" into pie-cts-dev am: 88aab6ce5f -s ours am: 7e40d670d1 -s ours
am: 810b0a0fe6 -s ours
Change-Id: I6d845314c4e649ed0a5b71504ba7b610202740e9
This commit is contained in: