Merge "Add InetAddressCompat" am: 871321f41b

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

Change-Id: I6946ca309ae923a637f5e5f0ad73c91b26b3c376
tree: c6b8c8f8ece1cb7bc52fdfd887233e4d1c0d8c4d
  1. framework/
  2. service/
  3. OWNERS