Merge "Camera: Use original dataspace/format for 3.5 device am: 22f6dcec7e am: 9d2ea958a6" into qt-r1-dev-plus-aosp