[automerger skipped] Add always-on VPN support for platform VPNs am: 522f3c932d am: 7deb069d3d am: 623f094210 -s ours
am skip reason: Change-Id I5eda88e5b406a0e425eb7424665cf702e0979324 with SHA-1 b570e8654d is in history

Change-Id: Id27267529b42f1b1be90613574f91e5fe7c780e4