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

* commit '1d33a37e0591b27386db2d324313e601cef42527':
  Add format string for displaying SPN in Wi-Fi calling mode.