Merge "Do NOT disable IMS settings for non-call SIM during a call" am: ed9b9d4815 am: 45d952b73e
am: 5c9287cee9

Change-Id: I3db11e53e07e707ae35728bcabee1e09c15b97a2