Merge "DefaultPermissionGrantPolicy: Pass correct arguments"
am: 0b325c6634

Change-Id: I5d217037bececb7a096ccfa018fafaa4280e4537