Merge commit 'dc4d5ad6482f97e33366f32ad2afd2a304810fb7' into eclair-plus-aosp
* commit 'dc4d5ad6482f97e33366f32ad2afd2a304810fb7':
Fix issue 2118500: Ringer volume control broken after a call is terminated while a ring tone is playing and a BT headset is connected.