Removing notifications that were kept around longer on click

Previously we were only removing them if it had auto-cancel set,
but that doesn't really make sense.

Change-Id: Iaed7ddd46d490edc0b32ada235d1b742e6d768b7
Fixes: 76410797
Test: add notification without auto cancel and reply on it to keep it around, observe it goes away after click