Merge "Add ConnectivityManager.networkCapabilitiesForType()"