Merge "Test UidCounterSetMap in NetworkStatsServiceTest" am: dd26c5709e

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

Change-Id: I3542978192829d265cc582c8c2d20c3cb60f4c86