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

Change-Id: I48d4ad194b25b4afc50c0e5cf7d7409a8f9fce4d
tree: 7a2c6c62ad9f55e6e3a0ae92c9fd55a5763858d1
  1. service/
  2. PREUPLOAD.cfg