am 43375216: Merge "Camera: fix early timeout for long exposure captures" into lollipop-mr1-cts-dev

* commit '43375216722013a0f7e46e62384510fa6dc1ed39':
  Camera: fix early timeout for long exposure captures