Merge "Merge "Adding SimPhonebookProvider" am: 7256965a45" into stage-aosp-master am: 85fbdbed51

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84b4b05f3debe30467f2cbf64e3bb24b432dbc6c