Merge change 26349 into eclair

* changes:
  Fix issue 2116700: Ringer screwy while connected over Bluetooth.