Merge "Fix getNetPermForUid to use appId instead of uid for query" into main am: 746bb32949 am: b2ac874848

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

Change-Id: I11f4bd900a26f309b6bb73f6c0c154441ab6c360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>