[automerger skipped] Merge "Replace NetworkQueryService with NetworkScanHelper" am: 5f0a7111ef am: 7ca6530361
am: 460fe4bdcb  -s ours

Change-Id: I16d99ad5771e586d74028ebaf6c6017b0d9ed252