am aaa453db: am 2c7dac19: am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev

* commit 'aaa453dbbdd9307ddc8fbd32e7f3c1e673e02b83':
  Settings shows it is connected to A2DP, though the device is not actually connected