Merge "Refactor thread leak monitoring" into main am: 584cadc1eb am: 98c38cafe8

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

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