Merge changes from topic "cross_AKM" into tm-dev am: 11a0b3471a am: e1547c3d54

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

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