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

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

Change-Id: I743565004136046256e37dc50099f67a8761d869