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: I41d30832722ed505f06690dfc4b610df09d932d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>