am b79b5e8d: Merge "Add a CTS test for the VPN API." into lmp-mr1-dev

* commit 'b79b5e8d868cdf28f7edd1b7e37dc380df43a91f':
  Add a CTS test for the VPN API.