Merge "Set security type to PSK for FT/PSK AKM" into udc-dev am: f0f3a22ecd

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

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