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: Iaa5e99d3eacec0d8f17358ce482df1ba6b1a14fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>