Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am: 0b325c6634 am: fd55f834c8
am: 80888cdcbe

Change-Id: I9852107278f6206582393a57be60074763a6cb81