Merge "Update UidCounterSetMap directly from NetworkStatsService" am: c84a601379 am: 8a0386ab52

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

Change-Id: Ibf3aafe11b818decaf43f5a76ec2c1f22b06011f