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

Change-Id: Iab7ace52b4add9e7c3f63f439fd4ead520e9c8d4