Merge "bass_client: Fix codecId cast issue" am: a5e9ee9b am: 478d7c94

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



Change-Id: I1de8ac2eb787ce4572218f112e9bbeb42f4015ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>