Merge "Revert "Use Service handler thread for NetworkStatsObservers"" into main