Merge "Test UidCounterSetMap in NetworkStatsServiceTest" am: dd26c5709e am: 852cc7891e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1961303

Change-Id: I5cd9b5c6e857cef1b03924f3fda5d2ca6246d09e