Merge "Fix issue #6373340: Cannot unlock to app if app was the..."

Author: Dianne Hackborn

services/java/com/android/server/am/ActivityManagerService.java

@@ -4116,6 +4116,10 @@ public void showBootMessage(final CharSequence msg, final boolean always) {
     public void dismissKeyguardOnNextActivity() {
         enforceNotIsolatedCaller("dismissKeyguardOnNextActivity");
         synchronized (this) {
+            if (mLockScreenShown) {
+                mLockScreenShown = false;
+                comeOutOfSleepIfNeededLocked();
+            }
             mMainStack.dismissKeyguardOnNextActivityLocked();
         }
     }