[automerger skipped] Merge "Polish ActivityEmbedding enter/exit PiP (1/n)"...

[automerger skipped] Merge "Polish ActivityEmbedding enter/exit PiP (1/n)" into tm-qpr-dev am: 9e3020b2 am: 5071339e -s ours

am skip reason: Merged-In Ifba090ad9ac9fb7033d343eab1c87c1a67bb9c11 with SHA-1 b033b5a4 is already in history

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



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