Merge "Ensure no thread leak after NetworkStatsServiceTest" into main am: c7126bb997

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

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