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

Change-Id: Iaca178d58a657ed59e3b9cbc08c3d2909cbf0811