Merge "Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK." into m-wireless-dev