Merge changes from topic "fix-mdns" into main am: 81e6439298

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

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