Merge "WifiHal: Correct typo for code comment" am: 12ca95ccc4
am: 2ad166a35b

Change-Id: I56f8779232716fa51f9d7c3d649712fa6f0afe32