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

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

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