Merge change 4827 into donut

* changes:
  Fix issue with shared user permissions. just look in the requested permissions of packages within shared user setting rather than the granted permissions

services/java/com/android/server/PackageManagerService.java

@@ -5934,7 +5934,7 @@ class PackageManagerService extends IPackageManager.Stub {
                     continue;
                 }
                 for (PackageSetting pkg:sus.packages) {
-                    if (pkg.grantedPermissions.contains (eachPerm)) {
+                    if (pkg.pkg.requestedPermissions.contains(eachPerm)) {
                         used = true;
                         break;
                     }