Merge "Fix enter/exit horizontal ActivityEmbedding split with Shell...

Merge "Fix enter/exit horizontal ActivityEmbedding split with Shell transition" into tm-qpr-dev am: 4013b560 am: 517bb187

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



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