Merge "Stop MdnsServiceTypeClient send on socket destroy" am: 3623306ccd am: 7916bb47fe am: b7bb454c28

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

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