Merge "Fix NetworkStatsObersers thread leak in the NetworkStatsServiceTest" into main am: 2deeef4f5e am: 5089628c53

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

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