Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev

am: 6e4de6ccdf

Change-Id: I55938f50f29289e1dcc51be18561d0819caa2b9b

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

@@ -543,7 +543,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
                     mKeyguardFadingOutInProgress = false;
                     mAnimatingDozeUnlock = false;
                 }
-                if (mWakingUpFromAodAnimationRunning) {
+                if (mWakingUpFromAodAnimationRunning && !mDeferFinishedListener) {
                     mWakingUpFromAodAnimationRunning = false;
                     mWakingUpFromAodInProgress = false;
                 }