Merge "Use MonitorThreadLeak in ConnectivityService tests" into main am: c45efc312e am: bb410b3e15 am: eb8a8e4532

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

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