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