am b73e94b4: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev

* commit 'b73e94b4173aca543ea506fbda70890311eba4d5':
  Secure access to WifiScanner