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

Change-Id: Ia53faad0ba004233d0ee031e1ca83d705f5bd379