[automerger skipped] Merge changes from topic "le-audio-broadcast-old-api" am:...

[automerger skipped] Merge changes from topic "le-audio-broadcast-old-api" am: 9a699a72 am: f5499a69 am: 69866e8c -s ours am: ea332070 -s ours

am skip reason: Merged-In I1b0d415e9af92a45535f7a6c2c3003d9c3192f31 with SHA-1 b9498587 is already in history

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



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