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

Change-Id: Ieda8cfeb352c14b857f8a9f0b7ed33bc0ce0abe1