[automerger skipped] Force FGS notifications to show for a minimum time am: 3692a6d231 -s ours am: 663d3d7991 -s ours
am: 13be3108cb -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 3b8c4743f6 is in history

Change-Id: I6d39b885aff0624f983e7290b83a88eeb6c92518