CameraManager: Fix NPE when camera is reset

Change-Id: I5b6912ea13901b60aedf037b946c232e470f3607
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.1