Merge "Revert "ConnectivityManagerTest: grant access to Wifi @hide APIs""