Fixed a bug where notifications were stale while collapsing

An update to the icons wasn't applied if the shade was currently
collapsing.
We now ensure that the two states are always in sync.

Test: 1) download AndroidBvtTests.apk from data/app from build artefacts
2) adb install -g -r pathToAndroidBvtTests.apk
3) adb shell am instrument -w -e class com.android.androidbvt.SysUINotificationShadeTests#testBundledNotifications com.android.androidbvt/android.support.test.runner.AndroidJUnitRunner
Bug: 32437839

Change-Id: I26c097bdda251b4dfddb6dbf0deee74c30560873

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

@@ -1873,6 +1873,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
 
         updateQsExpansionEnabled();
         mShadeUpdates.check();
+
+        // Let's also update the icons
+        mIconController.updateNotificationIcons(mNotificationData);
     }
 
     /**
@@ -2021,7 +2024,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         mNotificationData.filterAndSort();
 
         updateNotificationShade();
-        mIconController.updateNotificationIcons(mNotificationData);
     }
 
     public void requestNotificationUpdate() {