Merge "Add separate user consent for Platform VPNs" am: 53bc29df86 am: 1784e620b6

Change-Id: If2d856c62b77da4bc8ea99335b1e89170f24fbca
tree: 60a23226c864559ebe6c47bd3e7a34469d603d9b
  1. core/
  2. services/
  3. tests/