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

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

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