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

Change-Id: I5b7f51b9a657dad134776da5c2cf54f65778414f