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

[automerger skipped] Merge "Added cross sim calling settings support" am: 7f6a8a96 am: aa799612 am: a82cdddf -s ours

am skip reason: Change-Id I081c7e5fcc98f51a97c41a0a9a2b9b628c8d0415 with SHA-1 ea905079 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I842d8636b3bc951efca7b0ce61a03936a53a523f