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

Change-Id: I5fc6a53d2419d863d4d1a55caa7cc85171819f16