Merge "Merge "Change carrier name shown No Service to ECO" into qt-dev am:...
Merge "Merge "Change carrier name shown No Service to ECO" into qt-dev am: 7aee265a am: cfd9ee55" into qt-r1-dev-plus-aosp
am: d9380319
Change-Id: Iffc336233e675c366e9d400201efcdbe27bfc9ef