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

Change-Id: I68872ec4c09a800163bfffbea79c5712d5538ccd
tree: 032cbcdf0dd85b1018333669ef4029ed32955c5c
  1. tests/