Merge "Use appId for looking up allowed on restricted networks uids list" am: 02d7eb2abe am: 7d0eb2b22a

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

Change-Id: I3e65e9b03981ef0e470ab605c57154dfe214b705