Merge "Use PackageManager to detect wifi-only devices in ConnectivityManagerTest."