Merge "Add InetAddressCompat" am: 871321f41b am: 2c311c8b74 am: 0afced9423

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

Change-Id: I90dba64e96080cbd29f538de6dcb514dea4b6cbd
tree: 49efd7db57bb4cf5348254ac99d9458cfa3acbdd
  1. framework/
  2. service/
  3. OWNERS