Merge "Don't remove SYSTEM_FIXED for intentional fixed grants to critical apps." am: 547654cab7 am: 41a0de4d20

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1935975

Change-Id: I5685fcfb08fd5c268845abbe07fa259d9bd3d244

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

@@ -435,7 +435,8 @@ final class DefaultPermissionGrantPolicy {
                     || !pm.isGranted(Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
                             pkg, UserHandle.of(userId))
                     || !pm.isGranted(Manifest.permission.READ_PHONE_STATE, pkg,
-                            UserHandle.of(userId))) {
+                            UserHandle.of(userId))
+                    || pm.isSysComponentOrPersistentPlatformSignedPrivApp(pkg)) {
                 continue;
             }