[automerger skipped] Merge "Optimize SIM phonebook feature with new APIs" am:...

[automerger skipped] Merge "Optimize SIM phonebook feature with new APIs" am: d4a99869 am: 795eba2a -s ours am: c41f1ed3 -s ours am: 45c5aacd -s ours

am skip reason: Merged-In Ice0cc1cddc832b5ae0f272348503e28842fccbb6 with SHA-1 bbcef295 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440613

Change-Id: I942c1793811c7d3566be0754d0b97eb1fbdef256