Merge changes from topic "supplicant-cert-crash" into udc-dev am: e12166ac48 am: c7dedf3b74

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

Change-Id: I56e308afe842b18a019a36ffdf470dc43aa83c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>