Merge "[Wi-Fi] Revert "support SAE password identifier in wifi dialog""