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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24cd7564b61a6da7652ae01323bf7c6e52e05bec