Merge "Update UidCounterSetMap directly from NetworkStatsService" am: b68a9f0972

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958917

Change-Id: I36115a00c7b4feb5ee069bd9894318ea4133a005