Merge "Modify Settings to use new SIM call manager API"
am: 62d49fcdd8

Change-Id: Id4b02d18ce3978cd7b200d35e03149729a35ebb0