Merge "Multi-sim support for Ims related settings." am: 27d915cf20
am: ff6f29b959

Change-Id: I21e221c2134184aae2c5d936cd1840fe1ba68f7a