[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: 44c43c51 am: 2766aa91 -s ours am: 9de814cd -s ours am: dab8a319 -s ours

am skip reason: Change-Id I29983284b1a1c271d983c99b286e204604abdc72 with SHA-1 d84406ab 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