Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: ab49c33aef

Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/3531956

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