Merge "Fix enter/exit horizontal ActivityEmbedding split with legacy transition" into tm-qpr-dev am: 5a31efbff4

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

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