am 56b20860: Merge change 26349 into eclair

Merge commit '56b208602194a3923521bde1d87453ce3de39576' into eclair-plus-aosp

* commit '56b208602194a3923521bde1d87453ce3de39576':
  Fix issue 2116700: Ringer screwy while connected over Bluetooth.