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

* commit '9f593a217435b5639245917043696ed18b312856':
  Secure access to WifiScanner