DO NOT MERGE: unrevert "Force FGS notifications to show for a minimum time" am: b0d526ac12

Change-Id: Id030fe62bd5d665e291ce6ac11b03fdaf1f2af88