Merge "Quit handler threads at the end of the tests" into main am: 006f9d2998 am: 4e7593f72f

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

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