Remove the code the tries to create an invalid notification

Although invalid notification would be checked and not be created, it's better to get rid of any attempt of creating invalid notifications

Change-Id: I4bdbf7e0706b3613c7cf31ab07570fb4d1cdd045
Merge "Remove the code the tries to create an invalid notification"