am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread

Merge commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp

* commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4':
  Don't enter DISCONNECTING state when the call/connection is not alive