[automerger skipped] Merge 24Q4 into AOSP main am: 84021b4def -s ours

am skip reason: Merged-In Ic2563b64ecd4af67cce465060306b998e1cfa75c with SHA-1 0ac3f8227d is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Wifi/+/3413320

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