Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev

diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index 3913254,5baa7ff..7e61a80
--- 1/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
--- 2/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@@ -201,10 -223,10 +223,10 @@@ public class StatusBarKeyguardViewManag
       */
      public void reset(boolean hideBouncerWhenShowing) {
          if (mShowing) {
 -            if (mOccluded) {
 +            if (mOccluded && !mDozing) {
                  mStatusBar.hideKeyguard();
                  mStatusBar.stopWaitingForKeyguardExit();
-                 mBouncer.hide(false /* destroyView */);
+                 hideBouncer(false /* destroyView */);
              } else {
                  showBouncerOrKeyguard(hideBouncerWhenShowing);
              }