Merge "Display incoming call when phone account selection dialog shows" am: fdf68fbd0b am: 2f06e83ade am: f6a3e26644
am: 8012f1a83f

Change-Id: Ife7419f7c86aafe4a2a6a3656e257383b1f0c079