Merge "Consolidate leaving split screen to pip mode behavior" into tm-qpr-dev...

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

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



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