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 am: 446bc0b1 am: 648d78bb

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



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