Merge "Revert "Turn on foreground service type policy check.""