Merge "Camera2: Use CameraErrorCollector for CaptureResultTest"