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

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

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