Update removal logic for notifications

New pipeline:
Cancel the lifetime extension for notifications that are manually
dismissed by the user whether this is via manually dismissal or if the
user is clicking on an autoCancellable notification

Old pipeline:
Move the logic for dismissing the summary of a notification if the
user is dismissing the last child of a notification group to the
OnUserInteraction callback.

Test: atest NotifCollectionTest
Test: manual
Fixes: 166784583
Change-Id: I55398075ad9733b73d8ff900cd465fee9a4f01d1