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: I3ad45557df94791d1125c5792fded9c5c2ed0976
tree: be6cdac627aa62004c88f7a47252a10dd38065cd
  1. staticlibs/