Merge "Fix splitting with wrong apps when entering split with rotation" into...

Merge "Fix splitting with wrong apps when entering split with rotation" into tm-qpr-dev am: aeec8347

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



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