[automerger skipped] Correctly get uids for per-app network preferences am: 659a0e145f -s ours am: 067050a1a4 -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: I71214956e1061517554b590a9bbcfb29ecbc0fc5