[automerger skipped] Merge "Added cross sim calling settings support" am:...

[automerger skipped] Merge "Added cross sim calling settings support" am: 7c788a9e am: 3e9fae08 am: 32b79b60 -s ours

am skip reason: Change-Id Ibbe6e444641b134cb997d069fada5f71cf635ac4 with SHA-1 e900f02d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia88740090a9ccafebba955a5d7e34fcc70c0951a