Automated import from //branches/donutburger/...@141409,141409
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index 2fac5f7..a900b3e 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -929,6 +929,10 @@
 
     private void sendNotificationLocked(boolean on, int why)
     {
+        if (!on) {
+            mStillNeedSleepNotification = false;
+        }
+
         // Add to the queue.
         int index = 0;
         while (mBroadcastQueue[index] != -1) {