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

Change-Id: I1c6756b79364d511c9cf08b8a2764ea5de34fd91