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 am: 464ce81a am: c6bbc387 am: 3c4d3a73

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



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