Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev