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

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

Change-Id: I5243cd8de7b7414d27d539aec0a88baec6c9257d