Merge changes Iab923d09,Ibd18d410 into sc-dev am: 54e08602cf

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14033667

Change-Id: Iccf25c295f31b110fadcc721f20e8ab35f8557be

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationWakeUpCoordinator.kt

@@ -393,6 +393,11 @@ class NotificationWakeUpCoordinator @Inject constructor(
     override fun onDozingChanged(isDozing: Boolean) {
         if (isDozing) {
             setNotificationsVisible(visible = false, animate = false, increaseSpeed = false)
+        } else {
+            // We only unset the flag once we fully went asleep. If the user interrupts the
+            // animation in the middle, we have to abort the animation as well to make sure
+            // the notifications are visible again.
+            animatingScreenOff = false
         }
     }