Merge "Fix InetAddressCompat exception handling" am: cd37173df6 am: ef16d9420d am: efcd8e96e7

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

Change-Id: I6b1aa628a1c48c4c7ed02a4d379cab2316b13526