tree e9f82d4de50ba6cdaa5080ed9b7afdbc8993896a
parent 8c8286f8d5aed2e19a39e0b17fe221aca244f2b1
parent 7846b824e0e2ed1bffdd486374e7930c0c13d53f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580862250 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580862250 +0000

Merge "Add separate user consent for Platform VPNs" am: ede31cad1c am: 7846b824e0

Change-Id: If2d856c62b77da4bc8ea99335b1e89170f24fbca