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

Change-Id: I38ceff087e37f6ede6819e706c36ee9129a1cc6b