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

am skip reason: subject contains skip directive

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

Change-Id: I8551a032be19c11f18cacea4df4d79c7f0306ea8