Immediately close the shade when the status bar is disabled. (DO NOT MERGE)

This provides a quick fix for http://b/2298803 (if the
in-call UI comes up while the user is holding the
windowshade, the shade sticks in place and the display
becomes unresponsive).

Merged from master (I92a824fe).

TODO: safely restore code to animate the shade closed rather
than simply causing it to disappear.

Change-Id: I53dc76fdfe86636f30f37a223a88d27a5766d3eb

services/java/com/android/server/status/StatusBarService.java

@@ -1672,7 +1672,10 @@ public class StatusBarService extends IStatusBar.Stub
         // act accordingly
         if ((diff & StatusBarManager.DISABLE_EXPAND) != 0) {
             if ((net & StatusBarManager.DISABLE_EXPAND) != 0) {
-                animateCollapse();
+                Log.d(TAG, "DISABLE_EXPAND: yes");
+                mAnimating = false;
+                updateExpandedViewPos(0);
+                performCollapse();
             }
         }
         if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {