Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am: 0b325c66 am: fd55f834 am: 80888cdc am: 2603aab9 Change-Id: Iaca178d58a657ed59e3b9cbc08c3d2909cbf0811