Merge "Revert "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from"" into android11-tests-dev