Merge changes I616184fa,Ibc1500f5

* changes:
  Move mPermissions from package settings
  Move DefaultPermissionGrantPolicy