Allow tests to select network encryption

Change-Id: I273eee44c095690d0c2e3994befa97edc42496ac
2 files changed