am dcc752a8: am 90fb2dd6: Merge "AudioManager: restore setBluetoothA2dpOn() method" into jb-dev

* commit 'dcc752a8984361ba23da00bf2adeec4161b67af2':
  AudioManager: restore setBluetoothA2dpOn() method