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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fd1f7e4f9f1a1e27f37326ee71fa95393731d97