[automerger skipped] Merge "BluetoothLeAudio: Fix API for codec preferences" am: 2c989bcc am: 183ab38c am: 4b619cef -s ours am: fbdd71de -s ours

am skip reason: Merged-In Iee7a0c6d42dd029f9c24a27ec892eb7ef261263b with SHA-1 4fb6536c is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2020096

Change-Id: I9a91f59c48961bdacc40f3dccada444ea6d711e3