Merge "Fix InetAddressCompat exception handling" am: cd37173df6

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

Change-Id: I1d65d6b011e5ce585835e1c9df9eea0afb74b0f4
tree: 0a61729f6c7a9b2a42261b24b413f6b970312bf6
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS