Merge "[Settings Telephony] Carrier name API replacement" into qt-qpr1-dev am: 556b34d03d
am: f726a31457

Change-Id: I4690776bb8c8ed174883014063d224dda6c72971