Merge "Correct behavior answering incoming call with dialing self-managed call."
am: e65966af99

Change-Id: Ifaa55533e383f509a3eadf9420a8a31fc7099eea