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

Change-Id: I0f813700d620b164e3347e14427d21df322826f7