Merge "mediastress: add targetSetup to ensure screen stays on" into android12-tests-dev