Merge "Fix InetAddressCompat exception handling" am: cd37173df6 am: 3df03a83af

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

Change-Id: Ib33b1d69e8480ba1ee2193671a88ed91d624d4bc