Merge "Fix NetworkStatsObersers thread leak in the NetworkStatsServiceTest" into main