[automerger skipped] Merge "Merge Android R" am: c05ef90056 -s ours am: 99ce193712 -s ours am: 526cef4979 -s ours

am skip reason: Change-Id I652dcff381201dac9ad1984809def239c64dfd40 with SHA-1 da0eef832c is in history

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

Change-Id: I35baa79c060c5c27c154014d8421bd8220e9d8e7