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

am skip reason: Merged-In I74e74c6195c0df8979f418afd0e1e7c2b5d9109a with SHA-1 0b81e182cf is already in history

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

Change-Id: I38722411b143b6755b9cbdb20aaa74d4ab6953b1