[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." into rvc-dev am: ec4e5063 am: 2766aa919e -s ours am: d2716253 -s ours am: 43d4cbc5 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33e198e9f3c10a25cd9513869cfd44429fc11bed