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

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

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