[automerger skipped] Merge "Add multiple AKMs and td_policy for Synaptics Wi-Fi" into tm-qpr-dev am: c55112f265 am: 7c7862d12b -s ours

am skip reason: Merged-In Ibb258b001c75ce34f623ff8bdee638c091b9af7d with SHA-1 4138eec96c is already in history

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

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