Merge "Fix ShellTransitionTests on landscape devices" into tm-qpr-dev am: 5394471e

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



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