Merge "Crash invalid FGS notifications" into sc-dev am: bf79a4c434 am: 1463bd8a86

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

Change-Id: I60e0200ca1a67176baa8066485bd0a2d8d71bbf3

services/core/java/com/android/server/notification/NotificationManagerService.java

@@ -6196,8 +6196,10 @@ public class NotificationManagerService extends SystemService {
         // Fix the notification as best we can.
         try {
             fixNotification(notification, pkg, tag, id, userId);
-
         } catch (Exception e) {
+            if (notification.isForegroundService()) {
+                throw new SecurityException("Invalid FGS notification", e);
+            }
             Slog.e(TAG, "Cannot fix notification", e);
             return;
         }