Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" am: d99c455167 am: fce5f45653

Original change: https://android-review.googlesource.com/c/platform/cts/+/1322428

Change-Id: I09fe2f6d4ef6a20985cf662a616a2270002a4534
tree: 07d8cb0093d2b9123cb6ddd5397d84a21042d2f6
  1. tests/