[automerger skipped] SimPhoneBook: Add ANR/EMAIL support for USIM phonebook...

[automerger skipped] SimPhoneBook: Add ANR/EMAIL support for USIM phonebook am: ba92f404 am: e5ca0212 -s ours

am skip reason: Merged-In Ic71fbc748364efbee5bad629b94c5a24865064b3 with SHA-1 6fb2cf8a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1440474

Change-Id: I21d524987b6d08070a80190cf45085b5676a340a