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

Change-Id: I3e1aef2fa8b6bc34a86d879b8d89dcaf5f3af6d6