am 0124980e: resolved conflicts for merge of 082c0540 to lmp-mr1-dev-plus-aosp

* commit '0124980e9fe2f5d21748254441229820cca6b601':
  Prevent showing immersive confirmation unexpectedly

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

@@ -839,7 +839,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         // Detect user pressing the power button in panic when an application has
         // taken over the whole screen.
         boolean panic = mImmersiveModeConfirmation.onPowerKeyDown(interactive,
-                event.getDownTime(), isImmersiveMode(mLastSystemUiFlags));
+                SystemClock.elapsedRealtime(), isImmersiveMode(mLastSystemUiFlags));
         if (panic) {
             mHandler.post(mRequestTransientNav);
         }