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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e2954338461b79f069c5efc6f15acb38c0538fc