Merge "Merge "Reparent PiP to split screen on exit" into rvc-dev am: 11affeca am: 20dffe01" into rvc-d1-dev-plus-aosp am: 31d23ee7

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

Change-Id: I2e9a55c534ae06c8f596c736f877811aafe10a07