Merge "Fix NPEs in AppIdPermissionPolicy." into main