Merge "Consolidate entering split screen behavior" into tm-qpr-dev am: b60de628

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



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