[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a
am: 8c71ef4f2e  -s ours

Change-Id: I08adcf1639fa9f819e52caf267162cdd34b596f1