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

Change-Id: I1fab95651f30055b281114e3ee13afbdd17c65b6