Merge "Add InetAddressCompat" am: e1da163302 am: 2aec625379 am: 9bdd98e71d

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

Change-Id: I90dba64e96080cbd29f538de6dcb514dea4b6cbd
tree: ec3c8b48456944ff5cd29254503a3296b1d86d54
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS