Merge "Added cross sim calling settings support" am: 7f6a8a9648

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfaaad756b5987b4ce4109cf81418023aaa1e62e