Merge "Change carrier name shown No Service to ECO" into qt-dev
am: 7aee265a7f

Change-Id: I93ec1638fe500bc3799d5ee060dde88e135bfc32