Merge cherrypicks of [9256783, 9255501, 9255502, 9256667, 9256422, 9256668] into qt-c2f2-releaseandroid-10.0.0_r7

Change-Id: I5847668b6d045b44d527dace05a8b6144cab5b3a

1 files changed, 0 insertions, 11 deletions

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index dc56b03bb100..aa49ba62f48b 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -2735,17 +2735,6 @@ public final class PowerManagerService extends SystemService
         if (mScreenBrightnessBoostInProgress) {
             return true;
         }
-
-        // Because summoning the sandman is asyncronous, there is a time-gap where
-        // we release the display suspend blocker before the dream service acquires
-        // their own wakelock.  Within this gap, we can end up suspending before
-        // dream service has a chance to start.  To avoid this, we check if we want
-        // to doze and the sandman is scheduled and if so, keep the display on until
-        // that has passed.
-        if (mWakefulness == WAKEFULNESS_DOZING && mSandmanScheduled) {
-            return true;
-        }
-
         // Let the system suspend if the screen is off or dozing.
         return false;
     }