Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev

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

@@ -4065,6 +4065,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             pm.wakeUp(time);
             if (fromTouch) {
                 mScreenOnComingFromTouch = true;
+                mNotificationPanel.setTouchDisabled(false);
             }
         }
     }