Merge "Merge "Update carrier text when phone service state is changed" am: 66f685a235 am: 6b1d176936 am: 743cf38dc8" into oc-dev-plus-aosp
am: a045dc23b8

Change-Id: I2f6cf2138d5149c611e51a4a9d36c68340422728