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

Change-Id: Iaeeccf1f2546435802891a7cde08545ff828492a