Merge "Fix NPE for devices that don't use a lock icon on the bouncer." into qt-dev

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

@@ -693,6 +693,9 @@ public class KeyguardIndicationController implements StateListener {
 
         @Override
         public void onKeyguardBouncerChanged(boolean bouncer) {
+            if (mLockIcon == null) {
+                return;
+            }
             mLockIcon.setBouncerVisible(bouncer);
         }
     };