Merge "Replace Inet[4|6]Address#ANY" am: ab70e793 am: 046574ec am: b248125d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33cb758506a4b2626de368c6537688245ac554e2