Merge "Add InetAddressCompat" am: b648508ccb am: 23511a3eba

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289

Change-Id: I94fef501699aa01c997a03dd24a5a25442075af1