[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: da0eef832c -s ours am: 4d66b11e2e -s ours

am skip reason: Change-Id I76b1212936706a196a76c84a54dfe05b8c4899e7 with SHA-1 7cb60dfee4 is in history

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

Change-Id: I5b5538c13561b0149ef679147ae3522298394a6a