Merge "Revert "Pass in active device to all BluetoothA2dp APIs in packa...""