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: I04dfb79cc2e0198d3d9d5c31dde82b9946fdc109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>