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

Merge "Merge "Revert "Fix transition return issues when more than 1 level depth"" into rvc-dev am: 48e9dc67 am: 35b794f3" into rvc-d1-dev-plus-aosp am: 8990d1c3

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

Change-Id: I36bec611985aeaedc292de7e5c74cf5be068ee37