[automerger skipped] Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" am: 7cba5f4163 am: 997f6e9893 -s ours

am skip reason: Merged-In Ibea354d8dda1f02652a193820f3f9eb573b9a956 with SHA-1 a1ac564748 is already in history

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

Change-Id: Ieb21648cb9a9f3717ed5f5c36c5ba1e846591812