Merge "Replace NetworkQueryService with NetworkScanHelper"
am: 5f0a7111ef

Change-Id: I47dd0df737a6a5e64a832ed2f1e555630ef8393c