Merge "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: d68df5c1ec -s ours
Change-Id: If5c50080a3a5b7cb571262fca84f37913dbeb7db
This commit is contained in: