Merge "Connect WifiScanner synchronously without sync barrier" into nyc-dev am: 2657981
am: 740c433

* commit '740c433b5991055bc254dd1106858cf2a1943d17':
  Connect WifiScanner synchronously without sync barrier

Change-Id: I029b69e1ff1cb987ec88ac331192d3598db65d7e