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 am: c493d079

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

Change-Id: Id7b64bf8ae9b2a18b3fcb10e367e47c293bf19df