Merge "Update method of getting ScanResult of current network." am: b802b85c05 am: a893e086ed

Change-Id: Id218d7b3e05fefefffd9d87133fa84035db650ce
tree: 53d763ca8b76fd4e957815dfa82691625e9397b5
  1. service/
  2. PREUPLOAD.cfg