Merge "Fix Split animations after single-root" into tm-qpr-dev am: 2447139f

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



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