Merge "Expose two carrier configs for additional call settings" into main