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

Change-Id: I076692290d76c6661d4cfbb457fcc429c32be38b