[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: ec2c7c8bcb -s ours

am skip reason: Merged-In I460ae3059670a6042b3869dcaf7f95c052059077 with SHA-1 b8fb47eab3 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/libbt/+/3257838

Change-Id: Icdfc14f248605cb96b1c50b7b4292a5e0ab8fc30
Signed-off-by: Automerger Merge Worker <[email protected]>