[automerger skipped] Merge "Modify Settings to use new SIM call manager API" am: 62d49fcdd8
am: 1b5bc0dd05 -s ours
am skip reason: change_id I4e481d74c1b2bf8944b3c973c074146136592900 with SHA1 5069f3aaaf is in history

Change-Id: I6ecda9c67aab68c644f326919951d123046c63df