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

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

Change-Id: I5243cd8de7b7414d27d539aec0a88baec6c9257d