am ba956d16: am e116d3a3: Merge "Finish InCallActivity immediately for DisconnectCause.ERROR" into mnc-dev

* commit 'ba956d163d12d75fecf7ebbe793385a2cb669dac':
  Finish InCallActivity immediately for DisconnectCause.ERROR
tree: b238823d02401f46b927e3f8f7179117adbfdceb
  1. InCallUI/