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

Merge "Merge "Revert "Fix splitting with wrong apps when entering split with rotation"" into tm-qpr-dev am: 2940697c am: d3d69be3" into udc-dev am: 5987bdf4

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



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