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

Change-Id: Id7d0765782ba8e376e6bade63ad44bf6a1754a3b