[automerger skipped] Merge "Add separate user consent for Platform VPNs" am: ede31cad1c am: 7846b824e0 am: 3dfffac9c8 -s ours
am skip reason: Change-Id Ia6f36207d43c3748f938430c2780dcf29e5623f3 with SHA-1 418017e5f9 is in history

Change-Id: I7906d933b8e5e0a11d5ac800de9ef2c098323aaf