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

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

Change-Id: Ib18b7a5d798818caa2408153c4a3f5a43c584a5f