Merge "[automerger skipped] Remove wrapper for BluetoothA2dp am: 7fdac2d088 am: 68601f7ac5  -s ours"