Merge "Support multi-window scenarios in ScreenshotTest" into stage-aosp-sc-ts-dev am: 1025d4c46f am: 8a44c89252 am: 179bc308b2 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15769656 Change-Id: Ia95140bb74a0042672080161b9e710197b14b316