[automerger skipped] Remove the ServiceTypeClient after socket destroyed am: 45c1eaadb4 am: 5025043fb0 am: 1e68121e46 -s ours

am skip reason: Merged-In Ia917b14d3666f3bfe8e874606a34800a4ce65c5a with SHA-1 45c1eaadb4 is already in history

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

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