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

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



Change-Id: Ia2d15c824209f04ae0c7f156a51618d3dd91e8ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>