Merge "Disconnect held call when answering third call." into lmp-mr1-dev