[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 0c976e03e0 -s ours am: 2d52b3e57e -s ours am: 261c2583b9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4c552cddc5879b12ad2ef6918b8ea6093d862f3d