Merge "Fix ConnectivityManagerTest @hide Wifi API usages"
am: 7304f01576

Change-Id: Ibf64993339f68e7e6abac7b1fd9a8e0fe9a505a3