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

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

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