Merge "Merge "Update carrier text when phone service state is changed" am:...
Merge "Merge "Update carrier text when phone service state is changed" am: 66f685a2 am: 6b1d1769 am: 743cf38d" into oc-dev-plus-aosp
am: a045dc23
Change-Id: I2f6cf2138d5149c611e51a4a9d36c68340422728