Merge "Fix bugs for SIMs with multiple phonebook sets" am: 8a48814b05 am: c491e221a6 am: b949125343

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

Change-Id: I687123ebcb655fcac00854793208f5b05557dd26