[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 2ecf09724e -s ours

am skip reason: Change-Id I86a95c3767c48b6a64bed062e26a116609fa8221 with SHA-1 854f863e0b is in history

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

Change-Id: I6c62eee33a6a3adea2d3ef0b000456090b1aa77e