Merge "Merge "Polish entering pip from fullscreen with shell transition" into...

Merge "Merge "Polish entering pip from fullscreen with shell transition" into udc-dev am: 16e51ba1 am: d5cc5aa1" into udc-d1-dev-plus-aosp am: 88bbecb3

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



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