Merge changes I74745f89,Ia70f966c

* changes:
  Grant permissions to updated system packages
  Revert "Revert "Reduce coupling between DefaultPermissionGrantPolicy and PM""