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