[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 android11-tests-dev am: 736e06ee -s ours

am skip reason: Merged-In I29983284b1a1c271d983c99b286e204604abdc72 with SHA-1 57835f97 is already in history

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

Change-Id: I24ebf255ee81358c8fff4063a90f31973cd83050