Merge "Fixed problem where scrim transition would be cancelled" into oc-mr1-dev

am: 43aca9cdc8

Change-Id: I3de9cb8713cd0df80aeffc21c29bcfc9a3818d92

packages/SystemUI/src/com/android/systemui/doze/DozeUi.java

@@ -84,9 +84,6 @@ public class DozeUi implements DozeMachine.Part {
             case DOZE_REQUEST_PULSE:
                 pulseWhileDozing(mMachine.getPulseReason());
                 break;
-            case DOZE_PULSE_DONE:
-                mHost.abortPulsing();
-                break;
             case INITIALIZED:
                 mHost.startDozing();
                 break;

packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java

@@ -23,7 +23,7 @@ import android.os.Handler;
  */
 public class DelayedWakeLock implements WakeLock {
 
-    private static final long RELEASE_DELAY_MS = 100;
+    private static final long RELEASE_DELAY_MS = 120;
 
     private final Handler mHandler;
     private final WakeLock mInner;