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: 629a3fdf

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



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