Merge "Revert "Fix transition return issues when more than 1 level depth""...

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

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

Change-Id: Ib88c1bfe684cf8bab47fde2b8771a120bf659726