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

Change-Id: I144e73aee498a34d59e290b9b44ce90ce96c4953