Merge "Consider last parent when compose transition." into udc-dev am: 5831c74c4c am: 72f0938064

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

Change-Id: I044513c61a336044b098a883f6bef5c3a9937a32
Signed-off-by: Automerger Merge Worker <[email protected]>