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

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

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