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

Change-Id: I4e06aae3310b7f29d120daa3222f0d07c73b50b3