resolve merge conflicts of a1b8d77ca3 to master.

Change-Id: Ia78c6d31687542dfaba20b177e774333cfb1edb5

diff --cc core/res/AndroidManifest.xml
Simple merge

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
index e149616,7bca867..be9f44d
--- 1/services/core/java/com/android/server/pm/PackageManagerService.java
--- 2/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@@ -1759,13 -1717,10 +1759,14 @@@ public class PackageManagerService exte
          synchronized (mPackages) {
              for (String permission : pkg.requestedPermissions) {
                  BasePermission bp = mSettings.mPermissions.get(permission);
-                 if (bp != null && bp.isRuntime() && (grantedPermissions == null
-                         || ArrayUtils.contains(grantedPermissions, permission))) {
+                 if (bp != null && (bp.isRuntime() || bp.isDevelopment())
+                         && (grantedPermissions == null
+                                || ArrayUtils.contains(grantedPermissions, permission))) {
 -                    grantRuntimePermission(pkg.packageName, permission, userId);
 +                    final int flags = permissionsState.getPermissionFlags(permission, userId);
 +                    // Installer cannot change immutable permissions.
 +                    if ((flags & immutableFlags) == 0) {
 +                        grantRuntimePermission(pkg.packageName, permission, userId);
 +                    }
                  }
              }
          }