Merge "Take the multicast lock on mDNS usage" am: 5f921c4292

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

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