[automerger skipped] Merge "Add Network Scan helper class" am: dd21596dbb am: 726c3b0fa3
am: f85366d7d6  -s ours

Change-Id: I24c2d29c895aeb9a1631103e98739ddec80b7d63