Merge "Fix regression for answering a ringing call when there are 2 calls...
Merge "Fix regression for answering a ringing call when there are 2 calls already." into pi-dev am: e574daa1
am: ed98c45b
Change-Id: I55671d0e7758c5e03338b95b3316d0082473fbbf