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

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



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