Merge "Fix some shell transitions bugs breaking splashscreen cts" into sc-v2-dev am: 317e6698

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

Change-Id: Ida7bb38d0da0bd5b059e7c85cd99aaa03ff2efb1