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

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

Change-Id: Ie3b6a5d93e1ff1edfa55cb96bb511c307e4c280f