Merge "Replace the hidden getActiveLinkProperties usage"

     * @return the formatted and newline-separated IP addresses, or null if none.

     */

    private static String getDefaultIpAddresses(ConnectivityManager cm) {

        LinkProperties prop = cm.getActiveLinkProperties();

        LinkProperties prop = cm.getLinkProperties(cm.getActiveNetwork());

        return formatIpAddresses(prop);

    }