RESTRICT AUTOMERGE Revert "Revert "Revert "Workaround the stale notification window issue"""

This reverts commit a6777a357c49ccfa99db7309a1b7aeb60bee89a7.

Reason for revert: This CL was reverted because of a build breakage as an import was missing. Fixed the change

Change-Id: Ic04f83bffadd11460fa3963f0c678255c1551844
1 file changed