Merge changes from topic "am-a450dbeb86eb44fdb7fcaf3c5c2469e8" into android12L-tests-dev

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