Merge "Added AKMs in convertLegacyFieldsToSecurityParamsIfNeeded" into udc-dev am: b83af30938

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/23639653

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