[automerger skipped] Merge 24Q3 to AOSP main am: 8dc19e57bb -s ours

am skip reason: Merged-In Id78d452599bfca3664706ff1df474039e09a10f7 with SHA-1 ff6e3938b5 is already in history

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

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