am d1559d6b: Merge "Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call." into gingerbread

Merge commit 'd1559d6b2db1d7e1718a15dc43a82450de2934db' into gingerbread-plus-aosp

* commit 'd1559d6b2db1d7e1718a15dc43a82450de2934db':
  Fix issue 2301630:  Mismatch of state occurs when media server is killed while in-call.