am 5743a516: (-s ours) Merge "DO NOT MERGE - Wifi Passpoint API change" into lmp-preview-dev

* commit '5743a516bbf70be6e5f2db5b1becfb15fa6393b2':
  DO NOT MERGE - Wifi Passpoint API change