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

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

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