Merge "Finishing the visible requested activity vs. destroying it" into tm-qpr-dev am: ff91f4ef55

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

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

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

@@ -1062,7 +1062,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
                 if (activity == null || activity.finishing) {
                     break;
                 }
-                if (activity.isVisible()) {
+                if (activity.isVisible() || activity.isVisibleRequested()) {
                     // Prevent the transition from being executed too early if the activity is
                     // visible.
                     activity.finishIfPossible("finish-activity-op", false /* oomAdj */);