Merge "Use SimPhonebookContract for Contacts app SIM import" am: fefa2ff7d9 am: 7342d6d5fa

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/1580476

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4da61d6d4551d7f27b30fae5b88faa047fc3f648