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

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