Merge "Use different carrier name string for data connection in WiFi Calling...
Merge "Use different carrier name string for data connection in WiFi Calling mode." into lmp-mr1-wfc-dev
automerge: ce550fea
* commit 'ce550fea':
Use different carrier name string for data connection in WiFi Calling mode.