Merge changes from topic "data-service-grant-policy" into pi-dev

* changes:
  Add Permissions Grant for TelephonyDataService
  Add a Method to Revoke DefaultGrant Permissions

diff --cc core/java/android/content/pm/IPackageManager.aidl
Simple merge

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
Simple merge