Merge "Use MonitorThreadLeak in CSTest related tests" into main am: d54613fd4e am: fd347f48f0

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

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