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

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