DO NOT MERGE: Revert "Force FGS notifications to show for a minimum time"
am: 7c6df8dad1

Change-Id: I30774ee4835a9be8617894e2b32698ed7944ae0f