am 21790061: am f4b970e5: am 2705b859: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev

* commit '217900618fedda7ddc447b2fb861d0458cf8ed0e':
  Address API Council feedback for WifiAdapter/WPS APIs