Merge "Update documentation for KEY_CARRIER_NAME_STRING" am: fa6187510a am: 03dafac495
am: 48306e0a06

Change-Id: I6c73af383295d0c53e2b3451d61cfccb1ba2a441