Merge "Revert "Change carrier name shown No Service to ECO"" into qt-dev am: 9949266e40 am: 5cf9e2cf55
am: a73ed4459b

Change-Id: I246ad2b3fb74e5feb9dda450bc8692e1d549fb51