Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a  -s ours" into pie-cts-dev