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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0920437cfc609061dd6528cf931f9225e49236a