Merge "Update SimPhonebookProvider for UCS-2 name encoding" am: 6e6030406e am: 25a4d8c4da am: 0d8dafb865

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1566802

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b683a29fcb78f7e338465b49010b959b7e75c9d