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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I760b3a9007062414123e581ee3085cfa105540ec