[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-mr1-cts-dev am: 354de98f9a am: 8c71ef4f2e -s ours
am: 6c0b196b2e -s ours
Change-Id: I31bd21b35f6906f8bd6dbb8fbee2301eb9a7ce32
This commit is contained in: