Merge "Use new APIs from SIM phonebook provider" am: 654f59a1b5

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

Change-Id: I79769efaa1a78298f58c68ec7447197b04f7e61f