Remove the ServiceTypeClient after socket destroyed am: 45c1eaadb4

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

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