diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
index 9aa1a621a7600..2996cd13f7b15 100644
--- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
+++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java
@@ -159,7 +159,8 @@ class PackageManagerShellCommand extends ShellCommand {
         mInterface = service;
         mPermissionManager = permissionManager;
         try {
-            mShellPackageContext = context.createPackageContext("com.android.shell", 0);
+            mShellPackageContext = context.createPackageContextAsUser(
+                    "com.android.shell", 0, Binder.getCallingUserHandle());
         } catch (NameNotFoundException e) {
             // should not happen
             throw new RuntimeException(e);