Merge "Fix InetAddressCompat exception handling" am: cd37173df6

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

Change-Id: I1d65d6b011e5ce585835e1c9df9eea0afb74b0f4
tree: 98a0071c043ec44a0c86f2fe673da802fc7e9e02
  1. framework/
  2. service/
  3. OWNERS