Merge "Clear ActivityRecord#mDismissKeyguard flag after app launches." into tm-qpr-dev

services/core/java/com/android/server/wm/ActivityRecord.java

@@ -7399,7 +7399,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
         mTransit = TRANSIT_OLD_UNSET;
         mTransitFlags = 0;
         mNeedsAnimationBoundsLayer = false;
-        mDismissKeyguard = false;
 
         setAppLayoutChanges(FINISH_LAYOUT_REDO_ANIM | FINISH_LAYOUT_REDO_WALLPAPER,
                 "ActivityRecord");

services/core/java/com/android/server/wm/KeyguardController.java

@@ -627,6 +627,7 @@ class KeyguardController {
                 } else if (top.canShowWhenLocked()) {
                     mTopOccludesActivity = top;
                 }
+                top.mDismissKeyguard = false;
 
                 // Only the top activity may control occluded, as we can't occlude the Keyguard
                 // if the top app doesn't want to occlude it.