[automerger skipped] Merge "Merge RQ2A.210305.007" am: 9c57a76a7d -s ours am: 5ace28cf50 -s ours

am skip reason: Change-Id Iefa4ea74fdfbd64725ee19706e0a883159d0b96d with SHA-1 0cde3250d9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a8b3aaaf0816ada22db5f4a1784d9e51a44e078