Merge "Ensure the ServiceTypeClient Executor threads can be shutdown" into main am: 54125ef545

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

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