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 am: ba0db734 am: d6760601

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

Change-Id: I9d3c22a5f44794e4c3351e15e998843e07fda186