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

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

Change-Id: I0a853cfa3abfec8588dc0bdc97aef60230206bb8