[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev

am: 8c61445473  -s ours

Change-Id: I1581d4da5c0b0ffabb96941a8a416f7012630b80
This commit is contained in:
Rebecca Silberstein
2018-12-05 20:45:38 -08:00
committed by android-build-merger

Diff Content Not Available