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

am: f2a2e42bd0  -s ours

Change-Id: Ib70749e2242cfb515171a209bec953fbece35b92
This commit is contained in:
Rebecca Silberstein
2018-10-01 16:50:17 -07:00
committed by android-build-merger

Diff Content Not Available