Merge "WifiHal: Add support to accept either passphrase or pmk"