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

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