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

Change-Id: I560b95dca6dd62e102b5ce3ae80c531b676d5289