Merge "Update UidCounterSetMap directly from NetworkStatsService"