[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a2c18b71be -s ours am: 8b8619f8c2 -s ours

am skip reason: Merged-In Ice4803cf91173f070b97bbbfaf8c8929a174fa5a with SHA-1 d1c5483a9a is already in history

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

Change-Id: Ib951b61fc0844febe0442b3f36f1e70299356803