CameraITS: Fix for bad merge, in a merge conflct resolution earslier today

Change-Id: I2f21eb0142345373c5a17e407659a068f3f2ac61
1 file changed