Merge "QCamera3HWI: Set camera id in sensor mode for HDR+"