[automerger skipped] Merge "DO NOT MERGE: unrevert "Force FGS notifications to show for a minimum time"" into qt-qpr1-dev am: e24e97f9b2 am: f7eebf6f26 -s ours
am skip reason: subject contains skip directive

Change-Id: Iad10585bec969c09bb65a459174ffd1d20c02f8c