[automerger skipped] Add mixed entering pip transition with display change am: e76e2239 -s ours

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

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



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