Merge "msm-camera: Add SOF Consolidation for SHDRv3.8"