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

Change-Id: I07ca9a21d95bb46d0bc3b8cc8f1f3b50a1480da5