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

Change-Id: I3109ed3ce77ce023e778a78e854ce9551395b56c