Merge "Update carrier text when phone service state is changed" am: 66f685a235 am: 6b1d176936
am: 743cf38dc8

Change-Id: I9d59b0889ba99e05fc339005ae035e454b0e6509