Merge "Add javadoc comments mentioning ConnectivityManager API permissions." into mnc-dev