Merge "Refactor repeated WIFI bringup code in ConnectivityManagerTest" into oc-dev