Merge "Fix ConnectivityManagerTest @hide Wifi API usages"