Merge "Remove the ServiceTypeClient after socket destroyed" am: 6f47b7d501 am: 8bdeebe280 am: a512de7f99 am: adbb21630d

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

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