Merge "Replace Inet[4|6]Address#ANY" am: 970b0019c7 am: 91f4cc9d87 am: b248125d2a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33cb758506a4b2626de368c6537688245ac554e2
tree: 495f360565b6c579c23b4a871ac9f0dadc80797d
  1. framework/
  2. service/
  3. OWNERS