Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot"