Merge "Consolidate leaving split screen to pip mode behavior" into tm-qpr-dev am: 86d092aa

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



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