Merge " Add VTS code for the network scan API" am: 6ef70c9040
am: a944299fdb

Change-Id: Ided1250e85df239a4e5ddbec6ea4c6a2a17028b8