Merge "Fix AOD2 notifications not waking up the device if the screen off animation played." into sc-dev am: f1c4d4e1a4 am: 5f4485f124

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

Change-Id: I09be00f0723809deab2035f367c43703cb81fb43

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

@@ -1473,9 +1473,7 @@ public class StatusBar extends SystemUI implements DemoMode,
      * @param why the reason for the wake up
      */
     public void wakeUpIfDozing(long time, View where, String why) {
-        if (mDozing && !(mKeyguardViewMediator.isAnimatingScreenOff()
-                || mUnlockedScreenOffAnimationController
-                    .isScreenOffLightRevealAnimationPlaying())) {
+        if (mDozing && !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) {
             mPowerManager.wakeUp(
                     time, PowerManager.WAKE_REASON_GESTURE, "com.android.systemui:" + why);
             mWakeUpComingFromTouch = true;