Merge "[FUI19] Migrate ConnectivityService to use NetworkStatsManager"