Merge "Select SIM when calling back from call log." am: 2a82028eeb
am: c7dfd60b32

Change-Id: Ia276c2ba5a494017d76e360ae9f015b080ad6169