diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 91a0aede99ef4..cc5c6433e279a 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -2121,7 +2121,9 @@ class ContextImpl extends Context {
     public Context createPackageContextAsUser(String packageName, int flags, UserHandle user)
             throws NameNotFoundException {
         final boolean restricted = (flags & CONTEXT_RESTRICTED) == CONTEXT_RESTRICTED;
-        if (packageName.equals("system") || packageName.equals("android")) {
+        if ((packageName.equals("system") || packageName.equals("android"))
+                && user.getIdentifier() == UserHandle.getUserId(
+                        mPackageInfo.getApplicationInfo().uid)) {
             return new ContextImpl(this, mMainThread, mPackageInfo, mActivityToken,
                     user, restricted, mDisplay, mOverrideConfiguration);
         }