[automerger skipped] Merge "RESTRICT AUTOMERGE Revert "Revert "Revert "Workaround the stale notification window issue"""" into android12-tests-dev am: caa7117bbe -s ours

am skip reason: subject contains skip directive

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

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