Merge "Support multiple IPv4 / IPv6 addresses in MdnsResponse" am: 6477d7b697

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2431933

Change-Id: I30e9026e542e54499f07d95f8c1666a58ac3ea4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>