Merge "Added cross sim calling settings support" am: fd16224637 am: 5e0fa7af31

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c4425093653e227e0c35c9604ad78725150f194