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

* commit 'f783345309eee29aff6eb34bbb9a39919cdc8c01':
  CameraITS: add timeout value for do_capture

Change-Id: I127169785bc811e6a64b3bf88ff8e885805c0566