Merge "CTS test for setting HTTP proxy on a VPN network." am: 1ca625c2cb
am: 0e603d64bf

Change-Id: I8c21e8835b7783415379477a598e450824a78133
tree: 8944b293af9c13e3027dee6d369de852299cc074
  1. tests/