[automerger skipped] Merge "Add separate user consent for Platform VPNs" am: 53bc29df86 am: 1784e620b6 am: 735f90f644 -s ours
am skip reason: Change-Id Ia6f36207d43c3748f938430c2780dcf29e5623f3 with SHA-1 b3e30be7e4 is in history

Change-Id: I7906d933b8e5e0a11d5ac800de9ef2c098323aaf
tree: 4a9594d7e22830b8c483047cf7893ead739c1eb3
  1. core/
  2. services/
  3. tests/