Merge "Update SimPhonebookProvider for UCS-2 name encoding"