Merge "Matches all MdnsServiceTypeClient if using MdnsSocketClient" am: c2baf9403a am: bd3e3ec1b7 am: 5f5a283e80

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

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