Merge "Fix getNetPermForUid to use appId instead of uid for query" into main