Merge "Re-add binder method for getPriority in IBluetoothA2dp.aidl as well as...
Merge "Re-add binder method for getPriority in IBluetoothA2dp.aidl as well as getPriority and setPriority in IBluetoothHeadset.aidl" am: 10252e31 am: 14d25335
Change-Id: I6fb89b15bd77e73062faec4cf33c838987e3c597