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

* commit 'a8c0d5e6d4a83da42dc318fe61ac38a519043b99':
  Use PackageManager to detect wifi-only devices in ConnectivityManagerTest.