[automerger skipped] Merge "Revert "Move all BluetoothCodecConfig and...

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

am skip reason: Merged-In I29983284b1a1c271d983c99b286e204604abdc72 with SHA-1 57835f97 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1443487

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449263

Change-Id: I49ca9a625eeb097c1a69ee9ff02934d892537e15