Merge "Support IPv4/6 address type in Struct." am: 8e555572f0 am: 543b0662f4

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1538747

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc9eb5ed7ae692b2d0f302821d4a2c4419f50a65
tree: be6cdac627aa62004c88f7a47252a10dd38065cd
  1. staticlibs/