[automerger skipped] Merge 24Q3 to AOSP main am: 154a29d7ce -s ours am skip reason: Merged-In I12745b5b55ea2306f1d441b0b2d4d9617a65c36a with SHA-1 df9fbd3736 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/3257836 Change-Id: I49545bdd1eab05e90344ab7d416a2c9b0728310d Signed-off-by: Automerger Merge Worker <[email protected]>