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

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

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



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