[automerger skipped] Add always-on VPN support for platform VPNs am: 2482518ce3 am: 0ba1fb6181 am: c7fc6dd59f -s ours
am skip reason: Change-Id I5eda88e5b406a0e425eb7424665cf702e0979324 with SHA-1 c13b9a30b6 is in history

Change-Id: Id27267529b42f1b1be90613574f91e5fe7c780e4
tree: 8a730a63fd4feae296a18424e1bc6b17cd01668e
  1. core/
  2. services/
  3. tests/