Remove the ServiceTypeClient after socket destroyed am: 45c1eaadb4 am: 5025043fb0

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

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