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

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