Merge "Use callingUid not appId for permission check"