[automerger skipped] Merge "Added cross sim calling settings support" am: fd16224637 am: 5e0fa7af31 am: 01facf250a -s ours

am skip reason: Change-Id I520ea40cf02aaa433eb47f43104edfcddb44413a with SHA-1 e7be4edd9d is in history

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1532208

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b002423f2a3ddca5fe2c97b2975bf9c6cfefbdc