Merge "Merge "Reparent PiP to split screen on exit" into rvc-dev am:...

Merge "Merge "Reparent PiP to split screen on exit" into rvc-dev am: 11affeca am: f0caffa0 am: 5c0d240a" into rvc-qpr-dev-plus-aosp am: efdd913d

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

Change-Id: Ib075eb55bdc10becb5929a56ead71acdd8002434