Merge "Replace InetAddress#parseNumericAddress" am: 1f6851f66a am: 7e0396815e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f14d0196b3c641108b1e82def2998d2744cb855