Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev am: 48e9dc67f1 am: ba0db734e6 am: d676060146

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

Change-Id: I9d3c22a5f44794e4c3351e15e998843e07fda186

core/java/android/app/ExitTransitionCoordinator.java

@@ -434,8 +434,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
                 mSharedElementNotified = true;
                 delayCancel();
 
-                if (!mActivity.isTopOfTask() || (mIsReturning && !mActivity.isTaskRoot()
-                        && !mSharedElements.isEmpty())) {
+                if (!mActivity.isTopOfTask()) {
                     mResultReceiver.send(MSG_ALLOW_RETURN_TRANSITION, null);
                 }