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

Change-Id: I0ea121445ef419e46da9a66ceba0c4673c49ca0e