Merge changes from topic "am-e89bda069374497ebe5b494a4b4831eb" into rvc-qpr-dev-plus-aosp am: 8d3c4b27f2

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

Change-Id: Ib4fa52b7d25e42a0b14ad1d4ff102e47dd693faf