Merge "Fix InetAddressCompat exception handling" am: cd37173df6 am: 0355d169e1 am: f8583062fd am: 903fec2c31

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

Change-Id: I4e8256904118f7cf1526a8f13c879ae1e016b8dc