[automerger skipped] Merge "DO NOT MERGE -  Mark RQ2A.210105.001 as merged." am: 70cf7b1a4b -s ours am: 6f668cc08d -s ours

am skip reason: Merged-In I362a580824bf8feea87ea4ed2895af279b3fbc36 with SHA-1 5697f3dc40 is already in history

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

Change-Id: I761a23aebf90e04b600eb917112b390a0dc75705