Merge "Correctly get uids for per-app network preferences" am: 473ddeaebb am: d9c5536026

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

Change-Id: I1b99d78702c91ce3e4c69de95e09a0c1e7d7e4b5