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

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

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