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

Change-Id: I7644c6fcd15e0133103424223effc74401ad2f5e