Merge "Reduce coupling between DefaultPermissionGrantPolicy and PM"