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

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

Change-Id: I51852559319b74e9a9fb4cb3304fcc617bedd787