[automerger skipped] DO NOT MERGE: Revert "Force FGS notifications to show for...
[automerger skipped] DO NOT MERGE: Revert "Force FGS notifications to show for a minimum time" am: 7c6df8da
am: 23a4c82a -s ours
am skip reason: subject contains skip directive
Change-Id: Ie2c6254897a818064d427220128e4144444ee93c