[automerger skipped] Merge "Add mixed entering pip transition with display change" into 24D1-dev am: 799b149671 -s ours

am skip reason: Merged-In Ia1e5e8c7edb8c2a078a66b587d5d26a495166de2 with SHA-1 6373912c45 is already in history

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

Change-Id: I5d5f4beced5ace77df460eb70b385cfa19fd9268
Signed-off-by: Automerger Merge Worker <[email protected]>