[automerger skipped] Merge "[LeAudio] Add LocalBluetoothLeBroadcast and...

[automerger skipped] Merge "[LeAudio] Add LocalBluetoothLeBroadcast and LocalBluetoothLeBroadcastAssistant" am: 51b916cb am: b3605552 -s ours

am skip reason: Merged-In I7b7ecb087b08aeaec9d8035fd490b40e273d8c90 with SHA-1 a8233b62 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107986



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