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 am: 721e445b

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

Change-Id: I9df265b1e5ab8734b3f2917e3bd933f11809e026