[resolved conflict] Merge "Fix 2 OOB bugs in...

[resolved conflict] Merge "Fix 2 OOB bugs in LeAudioBroadcasterImpl::UpdateMetadata" into tm-qpr-dev am: b52a8e43 am: 9d91b513

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



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