[automerger skipped] RESTRICT AUTOMERGE Revert "Revert "Revert "Workaround the stale notification window issue""" am: 8b4c71708e -s ours

am skip reason: subject contains skip directive

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

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