Merge "Update carrier text when phone service state is changed" into oc-dev
am: ea4e770ed9

Change-Id: I0f385dd77dd42d1ad8ddc3784c0b5c8d1181a596