Revert "Don't defer FGS notification if it's already shown"

Revert "Verify behavior when FGS uses existing notification"

Revert submission 14414063-fgs-defer-fixes

Reason for revert: b/187373264
Reverted Changes:
I081a3cc88:Don't defer FGS notification if it's already shown...
I083583550:Verify behavior when FGS uses existing notificatio...

Bug: 187373264

Change-Id: I82edba69c583791ec603107b3407ce7a5efe83a0