Merge "Ensure no thread leak after NetworkStatsServiceTest" into main