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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I802cd053265cf63f1d73835fae1ba9d252a1464e