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

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

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