Merge " Add VTS code for the network scan API" am: 6ef70c9040 am: a944299fdb
am: a3c3f5f0f8  -s ours

Change-Id: If5423f27881b3362ce077aa31db6be006e6818eb