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

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

Change-Id: Ia47949629452c54c3c269418c87ed730762f7138