Merge "Skip NetworkStatsServiceTest before T"