The ServiceTypeClient should be removed after socket destroyed because it's no longer used by any request. The requests will be matched to the newly created ServiceTypeClient. Bug: 278635632 Test: atest FrameworksNetTests CtsNetTestCases (cherry picked from https://android-review.googlesource.com/q/commit:f2a51ac5f8cc6b1cfaaa0f8fd5c28af522806ca0) Merged-In: Ia917b14d3666f3bfe8e874606a34800a4ce65c5a Change-Id: Ia917b14d3666f3bfe8e874606a34800a4ce65c5a