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

Change-Id: I782d4bed3ad3150d0f5b4b87b687d923ca913e68