[automerger skipped] Merge "Force FGS notifications to show for a minimum...
[automerger skipped] Merge "Force FGS notifications to show for a minimum time" into qt-dev am: e590a7d0 am: 9ec959b8
am: cbab9293 -s ours
am skip reason: change_id I0680034ed9315aa2c05282524d48faaed066ebd0 with SHA1 09843a68 is in history
Change-Id: I91f64c2252e7ac3c09bea87c276d2fb5391e7e84