Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" into rvc-dev