Merge "Fix weird animation when switching back to split pair from recents"...

Merge "Fix weird animation when switching back to split pair from recents" into tm-dev am: ecbc9712 am: 8b16f865 am: 4188b4de

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



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