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

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

Change-Id: I90dba64e96080cbd29f538de6dcb514dea4b6cbd