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: 7e40d670d1  -s ours

Change-Id: I4f4fa863be658d32bf14bfc92a92523a2b5d9792