Merge "Update ConnectivityManager javadoc"