Merge changes from topic "cherrypick-setDismissKeyguard-sh5oh7kmyi" into tm-d1-dev am: aca8d31cc2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500329

Change-Id: I39649b4bc0a574b7ff6d33dc396fca9b8e8ba280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -7346,7 +7346,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

@@ -595,6 +595,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.