Merge "Fix testRelaunchConfigurationChangedWhileBecomingVisible flakiness" into sc-v2-dev

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

@@ -2969,14 +2969,15 @@ class Task extends TaskFragment {
     @Nullable
     ActivityRecord getOccludingActivityAbove(ActivityRecord activity) {
         final ActivityRecord top = getActivity(r -> {
-            if (!r.occludesParent()) {
-                return false;
-            }
             if (r == activity) {
                 // Reached the given activity, return the activity to stop searching.
                 return true;
             }
 
+            if (!r.occludesParent()) {
+                return false;
+            }
+
             TaskFragment parent = r.getTaskFragment();
             if (parent == activity.getTaskFragment()) {
                 // Found it. This activity on top of the given activity on the same TaskFragment.