Merge "Allow showBouncer to be overridden in subclasses"

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

@@ -4223,7 +4223,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         return false;
     }
 
-    private void showBouncer() {
+    protected void showBouncer() {
         if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {
             mWaitingForKeyguardExit = mStatusBarKeyguardViewManager.isShowing();
             mStatusBarKeyguardViewManager.dismiss();