[automerger skipped] Merge "Force only system uid can set uids allowed on restricted networks" am: 47202851ec am: a1e54368ae -s ours

am skip reason: Merged-In I175a831671d3e52460d28203b09f6c0dda56b61c with SHA-1 03635b3ad5 is already in history

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

Change-Id: I30b118cbcf773b9a382a50ccc5f5799b29afc9e0