Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev