Merge "Add UCS-2 support for SimPhonebookContract" am: 9a90bb9efa

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564508

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2e253a18327150163eda3275f037793d5c6d141