Merge "Test UidCounterSetMap in NetworkStatsServiceTest" am: dd26c5709e

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

Change-Id: Iedd5e3d591d454c2ff7b8e697f488124e00a74c1