Merge "Revert "Fix splitting with wrong apps when entering split with...

Merge "Revert "Fix splitting with wrong apps when entering split with rotation"" into tm-qpr-dev am: 2940697c am: d3d69be3 am: 11de366c am: 2ca74b21

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



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