Merge "Check last parent when calculating Shell transition root" into...

Merge "Check last parent when calculating Shell transition root" into tm-qpr-dev am: 4b2d3014 am: fe2a5540

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



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