Merge "wifi: add SAE password identifier to WifiConfiguration"