[automerger skipped] Fix regression for answering a ringing call when there...
[automerger skipped] Fix regression for answering a ringing call when there are 2 calls already. am: 62b6f140 am: f9e2f1b4 -s ours
am: d879489e
Change-Id: I6c66547e2a249c3d5d9a923f70652fbbf563ed69