am 923a2d16: am 811ad27d: Merge "Disconnect held call when answering third call." into lmp-mr1-dev

* commit '923a2d1692c1bbbd116b70e8e222b5ffe9cf7626':
  Disconnect held call when answering third call.