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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia92a90c1f6b0b87f75590275b72e77b5439c2ae2