Merge "Add separate user consent for Platform VPNs" am: ede31cad1c am: 7846b824e0

Change-Id: If2d856c62b77da4bc8ea99335b1e89170f24fbca