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

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