Change-Id I02eb5f22737720095f646f8db5c87fd66da129d6 adds VPN as a supported network type to all device configurations directly in software, independent of any external per-device configuration. Reflect this expectation in the test. Bug: 18439110 Bug: 18668362 Change-Id: I7fca77e564219c96e8a78372d4885c7b7f012a48