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

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

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