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

Change-Id: I8591fc288b281090b8b5d5b80cc3a2b394326643