Merge "Fix splitting with wrong apps when entering split with rotation" into tm-qpr-dev am: 629a3fdf am: 446bc0b1 am: 648d78bb am: cae53be9

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



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