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

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

Change-Id: Ie4129bb5a1f8a80d4dc4c72f0d8b2e039e31370a