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 am: 97a50a1348  -s ours
am: d543481f22  -s ours

Change-Id: Id2d454c6e8f81c13b9018dd5c7310251bfec2d35