Merge "Matches all MdnsServiceTypeClient if using MdnsSocketClient" am: c2baf9403a

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

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