[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2c24f4a322 -s ours am: bcc522a00a -s ours

am skip reason: Merged-In Id9937724a397d74c070a0b176c5ec0c18b71c9d1 with SHA-1 8542d2880d is already in history

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

Change-Id: I00dda30e61fc0a6371c205bb62acdea416126a55