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

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

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