Merge "CameraITS: add timeout value for do_capture" into marshmallow-cts-dev