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

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

Change-Id: I9859228494613e234ed109068e0019a463edfe1a