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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6f19204d54688ea6af69d503c6dae441ff7afce