[automerger skipped] Force FGS notifications to show for a minimum time am:...

[automerger skipped] Force FGS notifications to show for a minimum time am: 3692a6d2 -s ours am: 663d3d79 -s ours am: 13be3108 -s ours am: fead6f70 -s ours am: f7f67adc -s ours
am: cdc4357e -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 09843a68 is in history

Change-Id: I540758a0ee9c481130dc3cc20e5abf29f4d6165c