[automerger skipped] Correctly get uids for per-app network preferences am: 659a0e145f -s ours

am skip reason: Merged-In I7d75cdb02041e7a202254be2eaeca6c2b02d7c29 with SHA-1 b6b6a4335a is already in history

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

Change-Id: Iaee7562764d7d82813e9978bbed5b0382b663e48