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

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