Merge "WifiHal: Correct typo for code comment" am: 12ca95ccc4 am: 2ad166a35b am: 29a52adadc
am: 470d88340f

Change-Id: Ifc5a6413b5875bf865dbe99216326aa5f3d45d1d