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

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



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