[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 15ab8967bb -s ours

am skip reason: Merged-In I2d3f9c89ea02f7c813841ba1d5b376d7c0f977bf with SHA-1 d435d3abd9 is already in history

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

Change-Id: Ic102c6334969fb8115d5a80706dad065b4e52ef1