Merge "Don't explicitly wait for starting-window during tests with...

Merge "Don't explicitly wait for starting-window during tests with shell-transitions" into sc-v2-dev am: ed7cdd6d

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

Change-Id: I04071d026e0f6095bac3c312b99f4942ef5f7208