[automerger skipped] DO NOT MERGE: unrevert "Force FGS notifications to show for a minimum time" am: b0d526ac12 am: 896414c79d -s ours
am skip reason: subject contains skip directive

Change-Id: I224fa25fbd43c12f6070bf853db392a5c61c0dff