Fixes an issue where users could be stuck with heads up notifications

In a previous refactor, the notification would not be removed as soon
as possible anymore when its lifetime was extended, leading to issues
where a notification would never time out and therefore never be removed.
Additionally would we also extend the lifetime while the panel is
expanded, which is wrong.

Change-Id: If51ae9ab77ad4eb10166c71db3b902c6ac32fd06
Fixes: 122885133
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/AlertingNotificationManagerTest.java