Merge "Add new appop for Platform VPNs" am: b8dd5bcc23 am: 418b97e5db

Change-Id: I038a1b470edf2ec47ae8a05cd4c5cd82c3cfe152