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

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

Change-Id: Icbbf538a6dde02f05bf93a546821e35c49db4969