[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: cddf6dcb65 -s ours am: a19a05a778 -s ours

am skip reason: Change-Id I96e0bd9743911ea4c8d29ab6306441f4e03ed809 with SHA-1 924ae2e3d9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I551b35d84d4af8263ac20539bb5082371076e3a2