Merge "Camera2: lens shading related HAL3.3 update"