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
tree: 773a61189822f368680cb4e36f3e2d59cbf8ee28
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS