Merge "Add separate user consent for Platform VPNs"