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

[automerger skipped] Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." am: ac6c1a40 am: 09b112ff93 am: b6bf8a22 -s ours

am skip reason: Change-Id I29983284b1a1c271d983c99b286e204604abdc72 with SHA-1 f12655cc is in history

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

Change-Id: I6ad8a8975bce859e9ecea093adb80b9a71fbff71