Merge "Enable multi-sim support in assisted dialing." am: 0e130eb65c am: db982ef3b5
am: 37312d3d17

Change-Id: I6b0e33dfc142a51df17b2f8b1ef64fb41164be75