diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index f20d0a15ccbc4..3cd194b73a8df 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -2459,10 +2459,12 @@ public class NotificationManagerService extends SystemService {
 
         // Fix the notification as best we can.
         try {
-            Notification.addFieldsFromContext(getContext().createApplicationContext(
-                    getContext().getPackageManager().getApplicationInfoAsUser(
-                            pkg, PackageManager.MATCH_UNINSTALLED_PACKAGES, userId),
-                    Context.CONTEXT_RESTRICTED), notification);
+            if (!"android".equals(pkg) && !"system".equals(pkg)) {
+                Notification.addFieldsFromContext(getContext().createApplicationContext(
+                        getContext().getPackageManager().getApplicationInfoAsUser(
+                                pkg, PackageManager.MATCH_UNINSTALLED_PACKAGES, userId),
+                        Context.CONTEXT_RESTRICTED), notification);
+            }
         } catch (NameNotFoundException e) {
             Slog.e(TAG, "Cannot create a context for sending app", e);
             return;