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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd8d198890b1ae4c4c804a9092dbb84e99db4a4d