Merge "Camera: Use original dataspace/format for 3.5 device am: 22f6dcec am:...
Merge "Camera: Use original dataspace/format for 3.5 device am: 22f6dcec am: 9d2ea958" into qt-r1-dev-plus-aosp
am: 71743c74
Change-Id: I3ba48789e0d0718ed0c04eaaee4302822972e513