Merge "Update UidCounterSetMap directly from NetworkStatsService" am: b68a9f0972 am: f4b74cd9aa

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

Change-Id: Ibf3aafe11b818decaf43f5a76ec2c1f22b06011f