Merge "Fix CtsNetUtils connectTo/disconnectFromWifi" am: d99c455167 am: fce5f45653 am: 29f0b1fc74 am: f723371c6c

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

Change-Id: I743caa3a749825887b2d27be324d3fd300858556