am e56124b3: (-s ours) Merge "DO NOT MERGE: Revert "Make Wifi WPS API available on application layer"" into lmp-preview-dev

* commit 'e56124b39fcb952a9866d68a84f050bf63cc2140':
  DO NOT MERGE: Revert "Make Wifi WPS API available on application layer"