Merge "Add new WiFi Calling string without hyphen" into qt-dev
am: d7673a30d9

Change-Id: Iee7dec8eb787a21845f5d45caa7aea0dc1f54097