[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: 5ba504f1 am: 09b112ff am: 0207b415 -s ours am: ccbe60e1 -s ours

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

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

Change-Id: Ib4921c7f002aaf448ea251907146bf1842f0a2bf