[automerger skipped] Force FGS notifications to show for a minimum time
am: 3b8c4743f6 -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 5136eefeb3 is in history

Change-Id: I5ad32c66fa4502e232b802241789977252ddec8e