Merge "[MS44.2] Add unit test for API to query tagged UID summary" am: 5db1ea12b5 am: 7cb670e776

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

Change-Id: I94321afaf3acc7f245f34f9f3f3ad926979b5c5b