Merge "Remove InetAddressUtils.disallowDeprecatedFormats(InetAddress)"
am: e142ad2443

Change-Id: I10765dbb703b26599822bb868ce8a349f6c215e4