Merge "Add format string for displaying SPN in Wi-Fi calling mode." into lmp-mr1-wfc-dev