Merge "Replace NetworkQueryService with NetworkScanHelper" am: 5f0a7111ef
am: 7ca6530361

Change-Id: I0caccd8f31dfd4b17c59450b35e9bc262b1ae040