Merge "Fix InetAddressCompat exception handling" into sc-dev am: a9a0b49bbc

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

Change-Id: I4eff156cc1b6767e3f636bd3f7bdd54b0456cc9f
tree: 20777cc9dcfb016a85a4fa60fb7a4b58577f4ba5
  1. framework/
  2. service/
  3. OWNERS