Merge "Create an MdnsServiceTypeClient using a SocketKey" am: 7c60aaa851 am: 2a63cba7ee

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

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