Merge "Don't show dnd suppressed icons on aod" into qt-dev

am: 67fd7ad761

Change-Id: Ie216a6e499d25c8299cd0388565083ce54bd4d66

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;
     }