Merge "Camera2: copy user tag to HFR request list" into oc-dr1-dev

        CaptureRequest.Builder singleTargetRequestBuilder = new CaptureRequest.Builder(

                requestMetadata, /*reprocess*/false, CameraCaptureSession.SESSION_ID_NONE);

        // Carry over userTag, as native metadata doesn't have this field.

        singleTargetRequestBuilder.setTag(request.getTag());

        // Overwrite the capture intent to make sure a good value is set.

        Iterator<Surface> iterator = outputSurfaces.iterator();

        Surface firstSurface = iterator.next();

            requestMetadata = new CameraMetadataNative(request.getNativeCopy());

            doubleTargetRequestBuilder = new CaptureRequest.Builder(

                    requestMetadata, /*reprocess*/false, CameraCaptureSession.SESSION_ID_NONE);

            doubleTargetRequestBuilder.setTag(request.getTag());

            doubleTargetRequestBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT,

                    CaptureRequest.CONTROL_CAPTURE_INTENT_VIDEO_RECORD);

            doubleTargetRequestBuilder.addTarget(firstSurface);