Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData"