Merge "Camera: Set buffer request stream id" into qt-dev
am: 94dd578b02

Change-Id: I2672044b0b7a8a7a2a0c615a83b1e78402dddd4b