Merge "Fix blocked notifications screen" into rvc-dev am: 1528d932ed am: 367aeee6b8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11808483

Change-Id: I9ba51ea22f1551b79709c0de38230981920159df

src/com/android/settings/applications/AppStateNotificationBridge.java

@@ -84,6 +84,9 @@ public class AppStateNotificationBridge extends AppStateBaseBridge {
         for (AppEntry entry : apps) {
             NotificationsSentState stats =
                     map.get(getKey(UserHandle.getUserId(entry.info.uid), entry.info.packageName));
+            if (stats == null) {
+                stats = new NotificationsSentState();
+            }
             calculateAvgSentCounts(stats);
             addBlockStatus(entry, stats);
             entry.extraInfo = stats;