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

Change-Id: I1a41da7509e87085fe85b9e594d01a4798361728