Revert "Manual revert of 5s FGS notification enforcement"

This reverts commit b53036a6238b6d7c4f6dc48a1dbec68924f63698.

Reason for revert: Testing for b/175673373

Change-Id: I6b142ce6a7174faf343996e2d92a29bf5a0965ca
8 files changed