Merge change 23438 into eclair

* changes:
  Fix issue 2091594: music chirp after disconnecting A2DP.