Merge "Replace Inet[4|6]Address#ANY" am: 3483a8be68 am: cdb81da32c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ee00807430cd27ed1632a0a6f7c78ab0ae4a99f