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: 5ba504f179

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

Change-Id: Ie5cc73ee5ab28225529bbc8165c9ba3ef0490839