Merge "Merge "Add wait time for screen state changed" into android12-tests-dev am: 4bd77179cc" into android12L-tests-dev