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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45cf2b37c775da158cdec2d3b7f50ac491d2fca8
tree: 9e1c1e1281c3602914a4fb83b190f53ec9f73d28
  1. framework/
  2. service/
  3. OWNERS