Merge "DefaultPermissionGrantPolicy: Pass correct arguments"