Merge change 25050 into eclair

* changes:
  Fix issue 2118464: cannot play ring tones and notifications after disconnecting BT headset while in call.