[automerger skipped] Merge Android 13 QPR2 am: 831a24dbe7 -s ours am: 069e27142e -s ours

am skip reason: Merged-In Id998c69ca1dccbd3108c2e78f065521cdac45135 with SHA-1 a8bfe75958 is already in history

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

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