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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33cb758506a4b2626de368c6537688245ac554e2
tree: 8835c78157020078668fd0923118ede674489149
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS