Merge "Adding SimPhonebookProvider" am: 7256965a45 am: 1671915c7f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc69ea8ae829ec5b1287b4ccf7e2c1288accec2a