Merge "Camera3: don't let dequeueBuffer block indefinitely"
am: bbf70c5122

Change-Id: I1a5c0913910a1607ffdccd30c2d6630cd7f43ce1