Merge "Don't show dnd suppressed icons on aod" into qt-dev am: 67fd7ad761

am: 8a356a70bf

Change-Id: I6cc0a4dedcc31843dc9e81ca7bfaf23d343a2522

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java

@@ -215,16 +215,13 @@ public class NotificationIconAreaController implements DarkReceiver,
         if (entry.isRowDismissed() && hideDismissed) {
             return false;
         }
-
         if (hideRepliedMessages && entry.isLastMessageFromReply()) {
             return false;
         }
-
         // showAmbient == show in shade but not shelf
-        if (!showAmbient && entry.shouldSuppressStatusBar()) {
+        if ((!showAmbient || mFullyDark) && entry.shouldSuppressStatusBar()) {
             return false;
         }
-
         return true;
     }