tree 2f9889b11797ec601bac8d6e77c63fc9f291f58a
parent e94ac536ec3d4913976467cc5615d4267e4696e8
parent 623f0942103bfb44adf76fc210d8da5c26ba0eef
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582153701 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582153701 +0000

[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