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

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

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