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

Change-Id: If58a4a074d43eb8e30421f201a9312ad46c780c2