[automerger skipped] Merge "BassClient: Fix not putting empty metadata buffer on the list" into tm-qpr-dev am: 80064651 -s ours

am skip reason: Merged-In I7a2a190bc9f8795eab299cece0af0fd5f6e792f0 with SHA-1 c420c793 is already in history

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



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