Merge changes from topic "mdns-fixes-handaw-01292024" into main am: 969439d10c

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

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