[automerger skipped] DO NOT MERGE - Merge Android 13 am: f6921039b3 -s ours

am skip reason: Merged-In Id923db6513f9e2833854322994aa3a113ee1579d with SHA-1 92c34509f0 is already in history

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

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