Merge "Include/exclude mDNS interfaces based on transport" am: 5864b59462 am: 22829adca5

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

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