Merge "PackageManagerService: update grantPermission / revokePermission" into jb-mr2-dev