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

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

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