Merge "Merge "[automerger skipped] Merge "WifiManagerTest: allow for multiple modes" into oreo-cts-dev am: 8c61445473 -s ours" into oreo-mr1-cts-dev am: 7bd8640f4d -s ours" into pie-cts-dev am: a9d9e557e6 -s ours
am: 19fe49302c -s ours
Change-Id: Iec2f86a069406318d9d98a36302c3b68f2cada7d
This commit is contained in: