Merge "Stop MdnsServiceTypeClient send on socket destroy" am: 3623306ccd am: 7916bb47fe am: b7bb454c28 am: 6ca04d67bd am: 8f68e7f217

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

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