Merge "Update documentation for KEY_CARRIER_NAME_STRING"
am: fa6187510a

Change-Id: I50fe5f4ea30b6923e7ca5c0fe3eb62fa9db3dabf