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

Change-Id: I3c0c4fbec11780ae524278c4382cc0fe2262989f