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

Original change: https://android-review.googlesource.com/c/platform/cts/+/2181775

Change-Id: Idd248a21ddc68ca8c06bb013eff9e8aab5e3b942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>