Merge "Fix NPE in FlashlightController" into lmp-dev

packages/SystemUI/src/com/android/systemui/statusbar/policy/FlashlightController.java

@@ -308,7 +308,11 @@ public class FlashlightController {
             new CameraCaptureSession.StateListener() {
         @Override
         public void onConfigured(CameraCaptureSession session) {
-            mSession = session;
+            if (session.getDevice() == mCameraDevice) {
+                mSession = session;
+            } else {
+                session.close();
+            }
             postUpdateFlashlight();
         }