Merge "[automerger skipped] Merge "Revert "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from"" into android11-tests-dev am: 6ce73846c4 -s ours" into android12-tests-dev