Merge "Adds MSIM config support to PhoneConfigurationManager" into main