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

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

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