Merge "Camera3Device: Don't time out on long exposures" into oc-dr1-dev
am: 57cd4032c0

Change-Id: I494687696489d9e5ab57bd420dc6fb594bb392e7